[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 0571fa8211 -s ours
am: 4912fe90cc -s ours
am skip reason: subject contains skip directive

Change-Id: I79ce1a409c74c81f3ef5b7db970d0a99b6d5e14b