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

Change-Id: I2f537649cf9c1d9ca9182491dc9f10a82ae88781