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

Change-Id: I62d2bdcc5dbdb6dcdc38184e063d9825a6b1c5cc