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