[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: 891e9bad07
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic764fd53fed12834d6e0291f17fc72e66fb5dc3d
main
commit
c98755cd39