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

Change-Id: I0d0b1de9b1e4433c76e1826765785ed2b973c491