shaohaolin translating
Merge pull request #1787 from shaohaolin/master

shaohaolin translating