[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 85a56ba185 -s ours
am: 99a1032994 -s ours
am skip reason: subject contains skip directive

Change-Id: I5c8366909ff63c6446d40e79289cbaa524cd253e