translating
Merge pull request #2149 from geekpi/master

translating