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