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

Change-Id: I28e78b4a3620ad738414f1003890524c317e8e6f