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

Change-Id: Ic11ff834725c49cc6a7299d7faca3dbfd9e0c3a9