--- old/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java	2018-07-20 09:24:35.800397280 -0700
+++ new/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java	2018-07-20 09:24:35.274349552 -0700
@@ -116,8 +116,10 @@
                 "[-strict]                   将警告视为错误"},
         {".conf.url.specify.a.pre.configured.options.file",
                 "[-conf <url>]               指定预配置的选项文件"},
+        {".print.this.help.message",
+                "[-? -h --help]              输出此帮助消息"},
         {"Option.lacks.argument", "选项缺少参数"},
-        {"Please.type.jarsigner.help.for.usage", "请键入 jarsigner -help 以了解用法"},
+        {"Please.type.jarsigner.help.for.usage", "请键入 jarsigner --help 以了解用法"},
         {"Please.specify.jarfile.name", "请指定 jarfile 名称"},
         {"Please.specify.alias.name", "请指定别名"},
         {"Only.one.alias.can.be.specified", "只能指定一个别名"},
@@ -223,6 +225,7 @@
         {"Error.", "错误: "},
         {"...Signer", ">>> 签名者"},
         {"...TSA", ">>> TSA"},
+        {"trusted.certificate", "可信证书"},
         {"This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.",
                 "此 jar 包含尚未进行完整性检查的未签名条目。 "},
         {"This.jar.contains.entries.whose.signer.certificate.has.expired.",
@@ -239,8 +242,16 @@
                 "有关详细信息, 请使用 -verbose 和 -certs 选项重新运行。"},
         {"The.signer.certificate.has.expired.",
                 "签名者证书已过期。"},
+        {"The.timestamp.expired.1.but.usable.2",
+                "时间戳到期日期为 %1$tY-%1$tm-%1$td。不过，在签名者证书于 %2$tY-%2$tm-%2$td 到期之前，JAR 将有效。"},
+        {"The.timestamp.has.expired.",
+                "时间戳已到期。"},
         {"The.signer.certificate.will.expire.within.six.months.",
                 "签名者证书将在六个月内过期。"},
+        {"The.timestamp.will.expire.within.one.year.on.1",
+                "时间戳将在一年内于 %1$tY-%1$tm-%1$td 到期。"},
+        {"The.timestamp.will.expire.within.one.year.on.1.but.2",
+                "时间戳将在一年内于 %1$tY-%1$tm-%1$td 到期。不过，在签名者证书于 %2$tY-%2$tm-%2$td 到期之前，JAR 将有效。"},
         {"The.signer.certificate.is.not.yet.valid.",
                 "签名者证书仍无效。"},
         {"The.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing.",
@@ -273,10 +284,18 @@
                 "此 jar 包含其 TSA 证书链无效的条目。原因: %s"},
         {"no.timestamp.signing",
                 "未提供 -tsa 或 -tsacert, 此 jar 没有时间戳。如果没有时间戳, 则在签名者证书的到期日期 (%1$tY-%1$tm-%1$td) 之后, 用户可能无法验证此 jar。"},
+        {"invalid.timestamp.signing",
+                "时间戳无效。如果没有有效的时间戳，则在签名者证书的到期日期 (%1$tY-%1$tm-%1$td) 之后，用户可能无法验证此 jar。"},
         {"no.timestamp.verifying",
                 "此 jar 包含的签名没有时间戳。如果没有时间戳, 则在其中任一签名者证书到期 (最早为 %1$tY-%1$tm-%1$td) 之后, 用户可能无法验证此 jar。"},
         {"bad.timestamp.verifying",
                 "此 jar 包含带有无效时间戳的签名。如果没有有效时间戳, 则在其中任一签名者证书到期 (最早为 %1$tY-%1$tm-%1$td) 之后, 用户可能无法验证此 jar。\n有关详细信息, 请使用 -J-Djava.security.debug=jar 重新运行 jarsigner。"},
+        {"The.signer.certificate.will.expire.on.1.",
+                "签名者证书将于 %1$tY-%1$tm-%1$td 到期。"},
+        {"The.timestamp.will.expire.on.1.",
+                "时间戳将于 %1$tY-%1$tm-%1$td 到期。"},
+        {"signer.cert.expired.1.but.timestamp.good.2.",
+                "签名者证书到期日期为 %1$tY-%1$tm-%1$td。不过，在时间戳于 %2$tY-%2$tm-%2$td 到期之前，JAR 将有效。"},
         {"Unknown.password.type.", "未知口令类型: "},
         {"Cannot.find.environment.variable.",
                 "找不到环境变量: "},