Merge pull request #1836 from sotux/master-zh_CN-translation