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

Change-Id: I9de11f339446e4c75d659bbb6e31ddd277b4aca3