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

Change-Id: I700a2d79787514b9debae39c0f225687e26adb27