Merge pull request #2135 from geekpi/master

translating
translated