shaohaolin translating
Merge pull request #1783 from shaohaolin/master

shaohaolin translating