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