[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 6562981448
-s ours
am skip reason: subject contains skip directive
Change-Id: Id88e74f86f38baf9132d4b64723e710b261e6906
main
commit
786dd43b9e