Merge branch 'master' of https://github.com/LCTT/TranslateProject
保存下
Merge branch 'master' of https://github.com/runningwater/TranslateProject
Merge branch 'master' of https://github.com/LCTT/TranslateProject

Merge from LCTT.
翻译完成
Merge branch 'master' of https://github.com/LCTT/TranslateProject
翻译中 by runningwater
Merge branch 'master' of https://github.com/runningwater/TranslateProject
Merge pull request #1585 from runningwater/master

翻译完成