Merge branch 'jx/zh_CN-proposed' of github.com:jiangxin/git