translated
Merge pull request #1768 from johnhoow/master

translated