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

Change-Id: I3b89e3143774ca5c2030987437610f3b280b70c3