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