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