translated and moved
Merge pull request #1108 from Vic020/master

translated and moved