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

Change-Id: I2b84532c9db62f7155bd4683d9b0b02484f93271