translated
Merge pull request #1636 from guodongxiaren/master

translated