[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 801d177995 -s ours
am: da046065c4 -s ours
am skip reason: subject contains skip directive

Change-Id: Iff6efaacfa002a2e305c931c4e60a708f179fadd