Translated by disylee
Merge pull request #1014 from disylee/master

Translated by disylee