Merge branch 'master', remote-tracking branch 'lctt/master'
Merge branch 'master', remote-tracking branch 'lctt/master'
Translating...
finish translating
Merge pull request #1068 from MikeCoder/master

完成翻译