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

Change-Id: Ifb2c86fd56e21fda658b4c7b1e8e7dbabd5367b4