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

Change-Id: I9bb07364b95726b5e1b1f447f83ec5f9443706d6