translating by john
translate1
Merge pull request #1235 from johnhoow/master

translating by john
先给你合并了，下回注意