[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 00f42c18e7 -s ours
am: 6aecddb456 -s ours
am skip reason: subject contains skip directive

Change-Id: I6f41923e4119d129afcd05b08bea01d856f124d1