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