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

Change-Id: Iad7dc9fb10b7e585a04288bfc5911131c5a82a0a