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

Change-Id: Id017885d9e75d86c34c23bcd0568cc585d1aa157