[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 4061ed5736
-s ours
am skip reason: subject contains skip directive
Change-Id: I2bc82d808c258bdab168afa691d2a6415e597efb
main
commit
79209927d7