translated
Merge pull request #2077 from geekpi/master

translated