tranlated
Merge pull request #2137 from yupmoon/master

tranlated