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