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