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

Change-Id: I305f8ae441fc1161b9e82eb09252befb8bd439ed