[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: cd95311674
-s ours
am: 1080d669ab
-s ours
am skip reason: subject contains skip directive
Change-Id: Ibec5e92190b0151678c401d7ee8dc9417c63194b
main
commit
1e4d00401d