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

Change-Id: I4a4b41b10d4f468b5d78e396d7f1634ab4762eda