Translated
Merge pull request #1715 from geekpi/master

Translated