[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 9db1319d77
-s ours
am skip reason: subject contains skip directive
Change-Id: Iaee14a03484ebec30262e1b88ae89886bd65f83d
main
commit
3be975240e