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

Change-Id: I316b241d5460c59ec84567e51550bc6418dffb42