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

Change-Id: Ib3680317a75ba825293db10e951d72039d083180