[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: c38c7db007
-s ours
am: fc1a356a87
-s ours
am skip reason: subject contains skip directive
Change-Id: Icabf594ddd29089fd665d4b3f339d488f910890f
main
commit
51784692b9