zsJacky translating
Merge pull request #1192 from zsJacky/master

zsJacky translating