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

Change-Id: Id9c11f98769577ae9485a2fe4a7a726c7d6ca9e4