zh_CN language update
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #159 from RuralHunter/master

zh_CN language update