Translating
Merge pull request #1714 from geekpi/master

Translating