[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 4492996f04
-s ours am: 3071857e03
-s ours
am: 527eeca672
-s ours
am skip reason: subject contains skip directive
Change-Id: I546502d1a2f6366d36fb45b147462463c1bd79a4
main
commit
4faa320719