--- old/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java	2016-05-13 03:16:44.900466059 -0700
+++ new/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java	2016-05-13 03:16:44.501430897 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, 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
@@ -44,6 +44,7 @@
         {"signerClass.is.not.a.signing.mechanism", "{0}不是签名机制"},
         {"jarsigner.error.", "jarsigner 错误: "},
         {"Illegal.option.", "非法选项: "},
+        {"This.option.is.deprecated", "此选项已过时: "},
         {".keystore.must.be.NONE.if.storetype.is.{0}",
                 "如果 -storetype 为 {0}, 则 -keystore 必须为 NONE"},
         {".keypass.can.not.be.specified.if.storetype.is.{0}",
@@ -65,7 +66,7 @@
         {".keypass.password.password.for.private.key.if.different.",
                 "[-keypass <口令>]           私有密钥的口令 (如果不同)"},
         {".certchain.file.name.of.alternative.certchain.file",
-                "[-certchain <文件>]         替代 certchain 文件的名称"},
+                "[-certchain <文件>]         替代证书链文件的名称"},
         {".sigfile.file.name.of.SF.DSA.file",
                 "[-sigfile <文件>]           .SF/.DSA 文件的名称"},
         {".signedjar.file.name.of.signed.JAR.file",
@@ -88,10 +89,12 @@
                 "[-tsacert <别名>]           时间戳颁发机构的公共密钥证书"},
         {".tsapolicyid.tsapolicyid.for.Timestamping.Authority",
                 "[-tsapolicyid <oid>]        时间戳颁发机构的 TSAPolicyID"},
+        {".tsadigestalg.algorithm.of.digest.data.in.timestamping.request",
+                "[-tsadigestalg <算法>]      时间戳请求中的摘要数据的算法"},
         {".altsigner.class.class.name.of.an.alternative.signing.mechanism",
-                "[-altsigner <类>]           替代的签名机制的类名"},
+                "[-altsigner <类>]           替代的签名机制的类名\n                            (此选项已过时。)"},
         {".altsignerpath.pathlist.location.of.an.alternative.signing.mechanism",
-                "[-altsignerpath <路径列表>] 替代的签名机制的位置"},
+                "[-altsignerpath <路径列表>] 替代的签名机制的位置\n                            (此选项已过时。)"},
         {".internalsf.include.the.SF.file.inside.the.signature.block",
                 "[-internalsf]               在签名块内包含 .SF 文件"},
         {".sectionsonly.don.t.compute.hash.of.entire.manifest",
@@ -106,6 +109,8 @@
                 "  [-providerArg <参数>]]... 主类文件和构造器参数"},
         {".strict.treat.warnings.as.errors",
                 "[-strict]                   将警告视为错误"},
+        {".conf.url.specify.a.pre.configured.options.file",
+                "[-conf <url>]               指定预配置的选项文件"},
         {"Option.lacks.argument", "选项缺少参数"},
         {"Please.type.jarsigner.help.for.usage", "请键入 jarsigner -help 以了解用法"},
         {"Please.specify.jarfile.name", "请指定 jarfile 名称"},
@@ -134,8 +139,11 @@
         {".Signature.related.entries.","(与签名相关的条目)"},
         {".Unsigned.entries.", "(未签名条目)"},
         {"jar.is.unsigned.signatures.missing.or.not.parsable.",
-                "jar 未签名。(缺少签名或无法解析签名)"},
+                "jar 未签名。(缺少签名或无法对签名进行解析)"},
+        {"jar.signed.", "jar 已签名。"},
+        {"jar.signed.with.signer.errors.", "jar 已签名, 但出现签名者错误。"},
         {"jar.verified.", "jar 已验证。"},
+        {"jar.verified.with.signer.errors.", "jar 已验证, 但出现签名者错误。"},
         {"jarsigner.", "jarsigner: "},
         {"signature.filename.must.consist.of.the.following.characters.A.Z.0.9.or.",
                 "签名文件名必须包含以下字符: A-Z, 0-9, _ 或 -"},
@@ -191,6 +199,7 @@
                 "正在使用替代的签名机制"},
         {"entry.was.signed.on", "条目的签名日期为 {0}"},
         {"Warning.", "警告: "},
+        {"Error.", "错误: "},
         {"This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.",
                 "此 jar 包含尚未进行完整性检查的未签名条目。 "},
         {"This.jar.contains.entries.whose.signer.certificate.has.expired.",
@@ -199,6 +208,8 @@
                 "此 jar 包含签名者证书将在六个月内过期的条目。 "},
         {"This.jar.contains.entries.whose.signer.certificate.is.not.yet.valid.",
                 "此 jar 包含签名者证书仍无效的条目。 "},
+        {"This.jar.contains.entries.whose.signer.certificate.is.self.signed.",
+                "此 jar 包含其签名者证书为自签名证书的条目。"},
         {"Re.run.with.the.verbose.option.for.more.details.",
                 "有关详细信息, 请使用 -verbose 选项重新运行。"},
         {"Re.run.with.the.verbose.and.certs.options.for.more.details.",
@@ -223,10 +234,18 @@
                  "此 jar 包含由于签名者证书的 NetscapeCertType 扩展而无法进行代码签名的条目。"},
         {".{0}.extension.does.not.support.code.signing.",
                  "[{0} 扩展不支持代码签名]"},
-        {"The.signer.s.certificate.chain.is.not.validated.",
-                "签名者的证书链未验证。"},
-        {"This.jar.contains.entries.whose.certificate.chain.is.not.validated.",
-                 "此 jar 包含证书链未验证的条目。"},
+        {"The.signer.s.certificate.chain.is.not.validated.reason.1",
+                "签名者证书链未经过验证。原因: %s"},
+        {"The.signer.s.certificate.is.self.signed.",
+                "签名者证书为自签名证书。"},
+        {"The.1.algorithm.specified.for.the.2.option.is.considered.a.security.risk.",
+                "为 %2$s 选项指定的 %1$s 算法被视为存在安全风险。"},
+        {"This.jar.contains.entries.whose.certificate.chain.is.not.validated.reason.1",
+                 "此 jar 包含其证书链未经过验证的条目。原因: %s"},
+        {"no.timestamp.signing",
+                "未提供 -tsa 或 -tsacert, 此 jar 没有时间戳。如果没有时间戳, 则在签名者证书的到期日期 (%1$tY-%1$tm-%1$td) 或以后的任何撤销日期之后, 用户可能无法验证此 jar。"},
+        {"no.timestamp.verifying",
+                "此 jar 包含的签名没有时间戳。如果没有时间戳, 则在签名者证书的到期日期 (%1$tY-%1$tm-%1$td) 或以后的任何撤销日期之后, 用户可能无法验证此 jar。"},
         {"Unknown.password.type.", "未知口令类型: "},
         {"Cannot.find.environment.variable.",
                 "找不到环境变量: "},