finish translating
Merge pull request #1301 from bookjoy/master

finish translating
好吧，我先帮你合并和处理删除吧