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

Change-Id: I968bb1d6987ac3baab44a20b642ef4196026a408