Update zh-CN.yml
Merge pull request #353 from sungravity/patch-1

Update zh-CN.yml
Merge branch 'master' into 1.10
rails has problems with same controller and model scopes