Merge branch 'master', remote-tracking branch 'lctt/master'
Mike Tranlasting...
finish translating
Merge pull request #1018 from MikeCoder/master

MikeCoder Finish Translating