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

Change-Id: I9a6c23b21dc432c160dc647057ac15fa8c2c68bc