translated
Merge pull request #1993 from geekpi/master

translated