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