[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b567faffaa
-s ours
am: 49cc947902
-s ours
am skip reason: subject contains skip directive
Change-Id: Icdc5d52a5b7a1d1e4bfa7f622364e6501bb298ea
This commit is contained in: