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

Change-Id: I68438cc5fc0a8690c90bf501a7a70497985338f2