translating
Merge pull request #2158 from geekpi/master

translating