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

Change-Id: Ied0fc59fbc714c13bed330aed2a376e31e734f5f