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

Change-Id: I9ef48ef60149032f1b5fdc65c56ff6f53f1072cd