translated
Merge pull request #2042 from geekpi/master

translated