translating
Merge pull request #2156 from geekpi/master

translating