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

Change-Id: Ic598922e5cbb181a77a23ce52d0d9d6a3c6b4cbe