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

Change-Id: I8e5f43c209b741cbe36778c7da830a6718e0c842