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

Change-Id: Icd3e27d1584438c00050e065d183b04ea2432fab