[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 8b9c85f0cd
-s ours am: 8611a6d851
-s ours
am: b0e9f90cee
-s ours
am skip reason: subject contains skip directive
Change-Id: If115a01ae406ba9e84a8a2e45bcde7bdaa190010
This commit is contained in: