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

Change-Id: I52db4cee6d9d4c234c3ebaea10c7c1495b56f3c6