translated
Merge pull request #1785 from shaohaolin/master

Translation Finished