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

Change-Id: I706b9e5cd7171829f41edafdb2b381f39bb2a689