Translating
Merge pull request #2046 from geekpi/master

Translating