translating
Merge pull request #2129 from geekpi/master

translating