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

Change-Id: I53e148cde0f2097a8a40b7fef6e7195edf87727b