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

Change-Id: I85ae2760c7eb7a4589b1e9ed949aa6207cea654c