[Translating]
Merge pull request #2041 from geekpi/master

[Translating]