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

Change-Id: Ifd67901bd9f079efe94fbc6fe7a01ad9a47f7f25