Merge pull request #2 from renshan/develop

Merge from base
Correct some errors of translation
Correct some errors of translation
Correct some errors of translation
Merge pull request #30 from ZhouJ-sh/develop

Correct some errors of translation