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