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

Change-Id: If81d1fa82a55d9c1ba96bda36e6b9f4458e724cb