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

Change-Id: I95dd5b83a5cac8f546076fd9a1f4ab04acb63d91