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

Change-Id: I72274c61df8e631ed5bb826b7825566c8f175615