[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 9223659928
-s ours
am skip reason: subject contains skip directive
Change-Id: I7ad6ef899c277169ac2b338763c21e16043cf943
main
commit
545560b547