translated
Merge pull request #2047 from geekpi/master

translated