translating
Merge pull request #2066 from geekpi/master

translating