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

Change-Id: Icd42f6c16a88764105487ca6a045b6731ca38989