[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 6b7a42ebf2
-s ours
am skip reason: subject contains skip directive
Change-Id: I2c38e94cb07c35d148e7dfaca94b6a7e5ec4d09d
main
commit
62880febef