Merge pull request #923 from kuoruan/i18n-zh-cn