[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: I419c288f9379307fb0ecd6bd8c8a72ecb254b53b
main
commit
fde82958ce