translating
Merge pull request #2126 from geekpi/master

translating