[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 8d5ac64187
-s ours
am: 3b0a4a9282
-s ours
am skip reason: subject contains skip directive
Change-Id: I6f993cf2c8d3a8a875ac4fb3ceab47bb56ba29ed
main
commit
b2b5f35642