Merge pull request #29 from jdm/master

上游更新
Update zh_CN translation
Merge pull request #172 from meteormatt/master

Update zh_CN translation