Merge pull request #8421 from oukan/feature/translate-zh-CN
authorKevin Sawicki <kevin@github.com>
Thu, 26 Jan 2017 23:48:57 +0000 (15:48 -0800)
committerGitHub <noreply@github.com>
Thu, 26 Jan 2017 23:48:57 +0000 (15:48 -0800)
translate zh cn


Trivial merge