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

Change-Id: I3e80d4cb852de02961536f61551ed08399db1686