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

Change-Id: I66eb1369e032d555a84ef2f2e01f5756a5c70b2c