--- old/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_TW.java	2016-05-13 03:15:41.301861876 -0700
+++ new/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_TW.java	2016-05-13 03:15:40.949830856 -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(RETURN 如果和 <{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.",
@@ -381,9 +381,9 @@
                 "沒有來自 SSL 伺服器的憑證"},
 
         {".The.integrity.of.the.information.stored.in.your.keystore.",
-            "* 尚未驗證儲存於金鑰儲存庫中資訊  *\n* 的完整性！若要驗證其完整性，*\n* 您必須提供您的金鑰儲存庫密碼。                  *"},
+            "* 尚未驗證儲存於金鑰儲存庫中資訊  *\n* 的完整性！若要驗證其完整性，    *\n* 您必須提供您的金鑰儲存庫密碼。  *"},
         {".The.integrity.of.the.information.stored.in.the.srckeystore.",
-            "* 尚未驗證儲存於 srckeystore 中資訊*\n* 的完整性！若要驗證其完整性，您必須 *\n* 提供 srckeystore 密碼。          *"},
+            "* 尚未驗證儲存於 srckeystore 中資訊 *\n* 的完整性！若要驗證其完整性，您    *\n* 必須提供 srckeystore 密碼。       *"},
 
         {"Certificate.reply.does.not.contain.public.key.for.alias.",
                 "憑證回覆並未包含 <{0}> 的公開金鑰"},
@@ -433,6 +433,8 @@
     /**
      * Returns the contents of this <code>ResourceBundle</code>.
      *
+     * <p>
+     *
      * @return the contents of this <code>ResourceBundle</code>.
      */
     @Override