Merge pull request #3 from jenkinsci/master

merge from jenkins trunk
fixed i18n issue for Chinese(zh_CN): remove 查克·诺里斯说 ( "\u67E5\u514B\u00B7\u8BFA\u91CC\u65AF\u8BF4\uFF1A" )  from *.zh_CN.properties
Merge pull request #1142 from qxo/master

fixed i18n issue for Chinese(zh_CN): remove 查克·诺里斯说