src/share/classes/sun/security/util/AuthResources_zh_TW.java

rev 1469 : 7043548: message drop 3 translation integration
Reviewed-by: yhuang
rev 1487 : 7175367: NLS: 7u6 message drop10 integration
Reviewed-by: yhuang

@@ -92,11 +92,11 @@
 
         // com.sun.security.auth.module.Krb5LoginModule
         {"Kerberos.username.defUsername.",
                 "Kerberos \u4F7F\u7528\u8005\u540D\u7A31 [{0}]: "},
         {"Kerberos.password.for.username.",
-                "Kerberos \u5BC6\u78BC [{0}]: "},
+                "Kerberos \u5BC6\u78BC {0}: "},
 
         /***    EVERYTHING BELOW IS DEPRECATED  ***/
 
         // com.sun.security.auth.PolicyFile
         {".error.parsing.", ": \u5256\u6790\u932F\u8AA4 "},

@@ -109,21 +109,19 @@
         {"attempt.to.add.a.Permission.to.a.readonly.PermissionCollection",
             "\u8A66\u8457\u65B0\u589E\u6B0A\u9650\u81F3\u552F\u8B80\u7684 PermissionCollection"},
 
         // com.sun.security.auth.PolicyParser
         {"expected.keystore.type", "\u9810\u671F\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B"},
-        {"can.not.specify.Principal.with.a.",
-                "\u6C92\u6709\u842C\u7528\u5B57\u5143\u540D\u7A31\uFF0C\u7121\u6CD5\u6307\u5B9A"},
-        {"wildcard.class.without.a.wildcard.name",
-                "\u542B\u6709\u842C\u7528\u5B57\u5143\u985E\u5225\u7684 Principal"},
+        {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name",
+                "\u6C92\u6709\u842C\u7528\u5B57\u5143\u540D\u7A31\uFF0C\u7121\u6CD5\u6307\u5B9A\u542B\u6709\u842C\u7528\u5B57\u5143\u985E\u5225\u7684 Principal"},
         {"expected.codeBase.or.SignedBy", "\u9810\u671F\u7684 codeBase \u6216 SignedBy"},
         {"only.Principal.based.grant.entries.permitted",
                 "\u53EA\u5141\u8A31\u4EE5 Principal \u70BA\u57FA\u790E\u7684\u6388\u6B0A\u9805\u76EE"},
         {"expected.permission.entry", "\u9810\u671F\u7684\u6B0A\u9650\u9805\u76EE"},
         {"number.", "\u865F\u78BC "},
-        {"expected.", "\u9810\u671F\u7684 "},
-        {".read.end.of.file", "\uFF0C\u8B80\u53D6\u6A94\u6848\u7D50\u5C3E"},
+        {"expected.expect.read.end.of.file.",
+                "\u9810\u671F\u70BA {0}, \u8B80\u53D6\u6A94\u6848\u7D50\u5C3E"},
         {"expected.read.end.of.file", "\u9810\u671F\u7684 ';'\uFF0C\u8B80\u53D6\u6A94\u6848\u7D50\u5C3E"},
         {"line.", "\u884C "},
         {".expected.", ": \u9810\u671F '"},
         {".found.", "'\uFF0C\u767C\u73FE '"},
         {"QUOTE", "'"},

@@ -134,10 +132,13 @@
         {"SolarisNumericGroupPrincipal.Supplementary.Group.",
                 "SolarisNumericGroupPrincipal [\u9644\u52A0\u7FA4\u7D44]: "},
         {"SolarisNumericUserPrincipal.",
                 "SolarisNumericUserPrincipal: "},
         {"SolarisPrincipal.", "SolarisPrincipal: "},
+        // provided.null.name is the NullPointerException message when a
+        // developer incorrectly passes a null name to the constructor of
+        // subclasses of java.security.Principal
         {"provided.null.name", "\u63D0\u4F9B\u7A7A\u503C\u540D\u7A31"}
 
     };
 
     /**