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

Change-Id: I2d4e4be46226bcc1dd5e6087ae5b3714ad8c709e