johnhoow translating...
Merge pull request #1778 from johnhoow/master

johnhoow translating...