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

Change-Id: Icd1105544ab2bf55f3172fa5a34257b7665b628c