[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 0d6a3d5e45
-s ours
am skip reason: subject contains skip directive
Change-Id: I9e82c8b059209bf0a732330a55a53a7066629591
main
commit
da256d6977