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

Change-Id: I41e1560312cddc53029f10040e2dd25daf33b975