finish translating
Merge pull request #1145 from MikeCoder/master

finish translating