translated
modified
move
Merge pull request #1127 from Vic020/master

Translated and fix up