Merge pull request #1693 from sotux/master_zh-cn-translation