translated
moved
Merge pull request #1340 from Vic020/master

Translated