[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 6f4ed8f123
-s ours am: f280b745b6
-s ours
am: 2815bbd81b
-s ours
am skip reason: subject contains skip directive
Change-Id: I463b5d169c5a0f55cb10b0e9354d992d3105a406
main
commit
f691e6d631