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

Change-Id: I494b1a51fcc57ad0f1f82bbf4522055360e5919f