[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7dc20157fb -s ours
am: 08b38f6300 -s ours
am skip reason: subject contains skip directive

Change-Id: I53d545680327971026895ed59ea6a7a8305c628f