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

Change-Id: I61c45de16e2a398629d1580a4035bc82fc9904f2