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

finish translating