--- old/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java	2016-05-13 03:15:40.398782299 -0700
+++ new/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java	2016-05-13 03:15:40.051751719 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 package sun.security.tools.keytool;
 
 /**
- * This class represents the <code>ResourceBundle</code>
+ * <p> This class represents the <code>ResourceBundle</code>
  * for the keytool.
  *
  */
@@ -48,7 +48,7 @@
                  "密钥和证书管理工具"},
         {"Commands.", "命令:"},
         {"Use.keytool.command.name.help.for.usage.of.command.name",
-                "使用 \"keytool -command_name -help\" 获取 command_name 的用法"},
+                "使用 \"keytool -command_name -help\" 可获取 command_name 的用法。\n使用 -conf <url> 选项可指定预配置的选项文件。"},
         // keytool: help: commands
         {"Generates.a.certificate.request",
                 "生成证书请求"}, //-certreq
@@ -306,7 +306,7 @@
         {"Entry.type.type.", "条目类型: {0}"},
         {"Certificate.chain.length.", "证书链长度: "},
         {"Certificate.i.1.", "证书[{0,number,integer}]:"},
-        {"Certificate.fingerprint.SHA1.", "证书指纹 (SHA1): "},
+        {"Certificate.fingerprint.SHA.256.", "证书指纹 (SHA-256): "},
         {"Keystore.type.", "密钥库类型: "},
         {"Keystore.provider.", "密钥库提供方: "},
         {"Your.keystore.contains.keyStore.size.entry",
@@ -346,7 +346,7 @@
         {".RETURN.if.same.as.for.otherAlias.",
                 "\t(如果和 <{0}> 相同, 则按回车)"},
         {".PATTERN.printX509Cert",
-                "所有者: {0}\n发布者: {1}\n序列号: {2}\n有效期开始日期: {3}, 截止日期: {4}\n证书指纹:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t 签名算法名称: {8}\n\t 版本: {9}"},
+                "所有者: {0}\n发布者: {1}\n序列号: {2}\n生效时间: {3}, 失效时间: {4}\n证书指纹:\n\t SHA1: {5}\n\t SHA256: {6}\n签名算法名称: {7}\n主体公共密钥算法: {8} ({9,number,#})\n版本: {10}"},
         {"What.is.your.first.and.last.name.",
                 "您的名字与姓氏是什么?"},
         {"What.is.the.name.of.your.organizational.unit.",
@@ -433,6 +433,8 @@
     /**
      * Returns the contents of this <code>ResourceBundle</code>.
      *
+     * <p>
+     *
      * @return the contents of this <code>ResourceBundle</code>.
      */
     @Override