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

Change-Id: Iee4cfe146867b580d644ee0b9de2b6447cab44ff