[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0cf1a84f81
-s ours am: 3a87453b4b
-s ours
am: 2a2c2dd9e9
-s ours
am skip reason: subject contains skip directive
Change-Id: I1b87c1f65a226409724d3eb1a80b9476e2bf285a
This commit is contained in: