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