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

Change-Id: I89f04c85c381c39d1903cde432fd3ad0fed89f0b