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