[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6562981448
-s ours am: adb2e7a485
-s ours
am: 29c40ed017
-s ours
am skip reason: subject contains skip directive
Change-Id: Iebdb8efc6f53ebae4d355105e6aba949c0b7572e
main
commit
7304476a81