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

Change-Id: I62ceea6b46cee23ea9d2ffaca92c6062c21553e6