[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: b22d5f3fe7
-s ours
am skip reason: subject contains skip directive
Change-Id: I43f4b560c39258982bef2f0b4bb178dc8315ef7c
main
commit
6490697a64