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

Change-Id: Ib41c4cdebe13e661827cd263a0ec426639c4394c