Update zh_CN.lang
Merge pull request #516 from ViKaleidoscope/patch-1

Update zh_CN.lang
Made cables dyeable and made them not connect when of different colors (except for light gray, the default color, which connects to all other colors). Closes #517.
Merge branch 'master' of github.com:MightyPirates/OpenComputers
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

Conflicts:
	src/main/scala/li/cil/oc/client/PacketHandler.scala
	src/main/scala/li/cil/oc/common/multipart/CablePart.scala
	src/main/scala/li/cil/oc/common/multipart/MultiPart.scala