[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 458d825272
-s ours
am: ce4a39ddca
-s ours
am skip reason: subject contains skip directive
Change-Id: I66a5f72b48978492b90a384b2bc3b179d08595fe
main
commit
e5b71422fe