[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: cd95311674
-s ours
am: c83cc88f9b
-s ours
am skip reason: subject contains skip directive
Change-Id: I179b15a6ffc24831696d28e86ffba7d145c8f0e8
main
commit
ab260ffa84