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

Change-Id: Ifca8c42c8d26580200deb2578becf7a73cb96d51