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

Change-Id: Iccfd98779dacb93191083c8cb50b8041899f30db