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