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

Change-Id: I8b33bd72eaead5fdb0e53fd1bd8a86ddcebd5dcd