Translated
Merge pull request #1693 from johnhoow/master

Translated