translating
Merge pull request #982 from crowner/master

translating by  crowner
Merge pull request #983 from hunanchenxingyu/master

翻译中by hunanchenxingyu
翻译完成 by hunanchenxingyu