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

Change-Id: I7b6095b13e37a880b891c8c6d05bc5703ebdbc3d