[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e9fa91113e
-s ours
am: c70c3a3236
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie9e6eda811ead3e547ba9c299dd790a3d5fb5aba
main
commit
8095dc0335