finish translating
Merge pull request #989 from MikeCoder/master

finish translating