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

Change-Id: I900b23d5a18243b52e314ddc6d7e3db5f3863de8