[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: 6486b82908
-s ours
am skip reason: subject contains skip directive
Change-Id: If9bcede23d2c2fcf99b804a2bf812d20af9b6db5
main
commit
9ee53eb277