[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 1999854ad9
-s ours
am skip reason: subject contains skip directive
Change-Id: I2eb23c17d2bb610792ff6b6bd848b9086573de9f
main
commit
2735c8e21e