Update zh-HANS.coffee
Fixed merge conflicts.
Merge branch 'AbnerZheng-patch-1'