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

Change-Id: I313ed2082c9dfeb602c9d178bb2174036d0104bd