Merge pull request #2149 from geekpi/master

translating
Merge pull request #2150 from geekpi/master

translated
translating