diff -r 94ae0ede53a5 -r 3b33b57c0096 jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties
--- a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties	Wed Aug 10 02:50:58 2016 +0300
+++ b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties	Thu Aug 11 10:37:50 2016 -0700
@@ -85,6 +85,30 @@
         release {0} not valid
 error.release.value.toosmall=\
         release {0} not valid, must be >= 9
+error.validator.jarfile.exception=\
+        can not validate {0}: {1}
+error.validator.jarfile.invalid=\
+        invalid multi-release jar file {0} deleted
+error.validator.bad.entry.name=\
+        entry name malformed, {0}
+error.validator.version.notnumber=\
+        entry name: {0}, does not have a version number
+error.validator.entryname.tooshort=\
+        entry name: {0}, too short, not a directory
+error.validator.isolated.nested.class=\
+        entry: {0}, is an isolated nested class
+error.validator.new.public.class=\
+        entry: {0}, contains a new public class not found in base entries
+error.validator.identical.entry=\
+        warning - entry: {0} contains a class that is identical to an entry already in the jar
+error.validator.incompatible.class.version=\
+        entry: {0}, has a class version incompatible with an earlier version
+error.validator.different.api=\
+        entry: {0}, contains a class with different api from earlier version
+error.validator.resources.with.same.name=\
+         warning - entry: {0}, multiple resources with same name
+error.validator.names.mismatch=\
+         entry: {0}, contains a class with internal name {1}, names do not match
 out.added.manifest=\
         added manifest
 out.added.module-info=\
@@ -177,7 +201,7 @@
 main.help.opt.main.extract=\
 \  -x, --extract              Extract named (or all) files from the archive
 main.help.opt.main.print-module-descriptor=\
-\  -p, --print-module-descriptor  Print the module descriptor
+\  -d, --print-module-descriptor  Print the module descriptor
 main.help.opt.any=\
 \ Operation modifiers valid in any mode:\n\
 \n\
@@ -208,8 +232,8 @@
 \                             matched by the given pattern and that depend upon\n\
 \                             directly or indirectly on a modular jar being\n\
 \                             created or a non-modular jar being updated
-main.help.opt.create.update.modulepath=\
-\      --modulepath           Location of module dependence for generating\n\
+main.help.opt.create.update.module-path=\
+\  -p, --module-path          Location of module dependence for generating\n\
 \                             the hash
 main.help.opt.create.update.index=\
 \ Operation modifiers valid only in create, update, and generate-index mode:\n
@@ -226,7 +250,7 @@
 \ located in the root of the given directories, or the root of the jar archive\n\
 \ itself. The following operations are only valid when creating a modular jar,\n\
 \ or updating an existing non-modular jar: '--module-version',\n\
-\ '--hash-modules', and '--modulepath'.\n\
+\ '--hash-modules', and '--module-path'.\n\
 \n\
 \ Mandatory or optional arguments to long options are also mandatory or optional\n\
 \ for any corresponding short options.