--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties Thu May 18 14:54:56 2017 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties Tue May 23 23:26:21 2017 -0700
@@ -661,6 +661,9 @@
compiler.err.not.def.public.cant.access={0}\u5728{1}\u4E2D\u4E0D\u662F\u516C\u5171\u7684; \u65E0\u6CD5\u4ECE\u5916\u90E8\u7A0B\u5E8F\u5305\u4E2D\u5BF9\u5176\u8FDB\u884C\u8BBF\u95EE
# 0: symbol, 1: symbol
+compiler.err.not.def.public={0} \u5728 {1} \u4E2D\u4E0D\u662F\u516C\u5171\u7684
+
+# 0: symbol, 1: symbol
compiler.misc.not.def.public.cant.access={0}\u5728{1}\u4E2D\u4E0D\u662F\u516C\u5171\u7684; \u65E0\u6CD5\u4ECE\u5916\u90E8\u7A0B\u5E8F\u5305\u4E2D\u5BF9\u5176\u8FDB\u884C\u8BBF\u95EE
# 0: name
@@ -679,7 +682,7 @@
compiler.err.pkg.annotations.sb.in.package-info.java=\u7A0B\u5E8F\u5305\u6CE8\u91CA\u5E94\u5728\u6587\u4EF6 package-info.java \u4E2D
-compiler.err.no.pkg.in.module-info.java=\u7A0B\u5E8F\u5305\u5B50\u53E5\u4E0D\u5E94\u5728\u6587\u4EF6 module-info.java \u4E2D
+compiler.err.no.pkg.in.module-info.java=\u6587\u4EF6 module-info.java \u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u7A0B\u5E8F\u5305\u58F0\u660E
# 0: symbol
compiler.err.pkg.clashes.with.class.of.same.name=\u7A0B\u5E8F\u5305{0}\u4E0E\u5E26\u6709\u76F8\u540C\u540D\u79F0\u7684\u7C7B\u51B2\u7A81
@@ -892,8 +895,8 @@
# In the following string, {0} is the name of the class in the Java source.
# It really should be used two times..
-# 0: name
-compiler.err.class.public.should.be.in.file=\u7C7B{0}\u662F\u516C\u5171\u7684, \u5E94\u5728\u540D\u4E3A {0}.java \u7684\u6587\u4EF6\u4E2D\u58F0\u660E
+# 0: kind name, 1: name
+compiler.err.class.public.should.be.in.file={0} {1} \u662F\u516C\u5171\u7684, \u5E94\u5728\u540D\u4E3A {1}.java \u7684\u6587\u4EF6\u4E2D\u58F0\u660E
## All errors which do not refer to a particular line in the source code are
## preceded by this string.
@@ -927,12 +930,14 @@
# 0: path
compiler.warn.outdir.is.in.exploded.module=\u8F93\u51FA\u76EE\u5F55\u4F4D\u4E8E\u5C55\u5F00\u7684\u6A21\u5757\u4E2D: {0}
-# 0: path
+# 0: file object
compiler.err.locn.module-info.not.allowed.on.patch.path=\u5728\u8865\u4E01\u7A0B\u5E8F\u8DEF\u5F84\u4E2D\u4E0D\u5141\u8BB8 module-info.class: {0}
# 0: string
compiler.err.locn.invalid.arg.for.xpatch=--patch-module \u9009\u9879\u7684\u53C2\u6570\u65E0\u6548: {0}
+compiler.err.file.sb.on.source.or.patch.path.for.module=\u6587\u4EF6\u5E94\u5728\u6E90\u8DEF\u5F84\u6216\u6A21\u5757\u7684\u8865\u4E01\u7A0B\u5E8F\u8DEF\u5F84\u4E2D
+
#####
# Fatal Errors
@@ -1031,6 +1036,9 @@
# 0: string
compiler.note.proc.messager={0}
+# 0: string, 1: string, 2: string
+compiler.note.multiple.elements=\u901A\u8FC7 javax.lang.model.util.Elements.{0} \u5728\u6A21\u5757 ''{2}'' \u4E2D\u627E\u5230\u4E86\u591A\u4E2A\u540D\u4E3A ''{1}'' \u7684\u5143\u7D20\u3002
+
#####
# 0: number
@@ -1103,7 +1111,10 @@
compiler.warn.finally.cannot.complete=finally \u5B50\u53E5\u65E0\u6CD5\u6B63\u5E38\u5B8C\u6210
# 0: name
-compiler.warn.poor.choice.for.module.name=\u6A21\u5757\u540D\u79F0 {0} \u5E94\u907F\u514D\u4EE5\u6570\u5B57\u7ED3\u5C3E
+compiler.warn.poor.choice.for.module.name=\u6A21\u5757\u540D\u79F0\u7EC4\u6210\u90E8\u5206 {0} \u5E94\u907F\u514D\u4EE5\u6570\u5B57\u7ED3\u5C3E
+
+# 0: string
+compiler.warn.incubating.modules=\u4F7F\u7528 incubating \u6A21\u5757: {0}
# 0: symbol, 1: symbol
compiler.warn.has.been.deprecated={1}\u4E2D\u7684{0}\u5DF2\u8FC7\u65F6
@@ -1191,6 +1202,10 @@
# 0: name, 1: number, 2: number, 3: number, 4: number
compiler.warn.future.attr={1}.{2} \u7248\u7C7B\u6587\u4EF6\u4E2D\u5F15\u5165\u7684 {0} \u5C5E\u6027\u5728 {3}.{4} \u7248\u7C7B\u6587\u4EF6\u4E2D\u88AB\u5FFD\u7565
+compiler.warn.requires.automatic=\u9700\u8981\u81EA\u52A8\u6A21\u5757\u7684\u6307\u4EE4
+
+compiler.warn.requires.transitive.automatic=\u9700\u8981\u81EA\u52A8\u6A21\u5757\u7684\u8FC7\u6E21\u6307\u4EE4
+
# Warnings related to annotation processing
# 0: string
compiler.warn.proc.package.does.not.exist=\u7A0B\u5E8F\u5305{0}\u4E0D\u5B58\u5728
@@ -1360,6 +1375,8 @@
## The following are related in form, but do not easily fit the above paradigm.
compiler.err.expected.module=\u9700\u8981 ''module''
+compiler.err.expected.module.or.open=\u9700\u8981 ''module'' \u6216 ''open''
+
compiler.err.dot.class.expected=\u9700\u8981 ''.class''
## The argument to this string will always be either 'case' or 'default'.
@@ -2013,6 +2030,10 @@
compiler.err.too.many.modules=\u627E\u5230\u592A\u591A\u7684\u6A21\u5757\u58F0\u660E
+compiler.err.module.not.found.on.module.source.path=\u5728\u6A21\u5757\u6E90\u8DEF\u5F84\u4E2D\u627E\u4E0D\u5230\u6A21\u5757
+
+compiler.err.not.in.module.on.module.source.path=\u4E0D\u5728\u6A21\u5757\u6E90\u8DEF\u5F84\u4E0A\u7684\u6A21\u5757\u4E2D
+
# 0: symbol
compiler.err.duplicate.module=\u91CD\u590D\u7684\u6A21\u5757: {0}
@@ -2033,6 +2054,9 @@
compiler.err.no.opens.unless.strong=\u53EA\u5141\u8BB8\u5728\u5F3A\u6A21\u5757\u4E2D\u4F7F\u7528 ''opens''
+# 0: symbol
+compiler.err.repeated.provides.for.service=\u670D\u52A1 {0} \u6709\u591A\u4E2A ''provides''
+
# 0: symbol, 1: symbol
compiler.err.duplicate.provides=\u91CD\u590D\u7684 provides \u6307\u4EE4: \u670D\u52A1 {0}, \u5B9E\u73B0 {1}
@@ -2061,6 +2085,9 @@
# 0: symbol
compiler.err.package.empty.or.not.found=\u7A0B\u5E8F\u5305\u4E3A\u7A7A\u6216\u4E0D\u5B58\u5728: {0}
+# 0: symbol
+compiler.warn.package.empty.or.not.found=\u7A0B\u5E8F\u5305\u4E3A\u7A7A\u6216\u4E0D\u5B58\u5728: {0}
+
compiler.err.no.output.dir=\u672A\u6307\u5B9A\u7C7B\u8F93\u51FA\u76EE\u5F55
compiler.err.unnamed.pkg.not.allowed.named.modules=\u547D\u540D\u6A21\u5757\u4E2D\u4E0D\u5141\u8BB8\u672A\u547D\u540D\u7A0B\u5E8F\u5305
@@ -2079,11 +2106,11 @@
compiler.err.module.decl.sb.in.module-info.java=\u6A21\u5757\u58F0\u660E\u5E94\u8BE5\u5728\u540D\u4E3A module-info.java \u7684\u6587\u4EF6\u4E2D
-compiler.err.module-info.with.xmodule.sourcepath=\u6E90\u8DEF\u5F84\u4E0A\u7684 -Xmodule \u4E0E module-info \u7684\u7EC4\u5408\u975E\u6CD5
-
-compiler.err.module-info.with.xmodule.classpath=\u7C7B\u8DEF\u5F84\u4E0A\u7684 -Xmodule \u4E0E module-info \u7684\u7EC4\u5408\u975E\u6CD5
-
-compiler.err.xmodule.no.module.sourcepath=-Xmodule \u4E0E --module-source-path \u7684\u7EC4\u5408\u975E\u6CD5
+# 0: set of string
+compiler.err.too.many.patched.modules=\u592A\u591A\u6253\u8865\u4E01\u7684\u6A21\u5757 ({0}), \u8BF7\u4F7F\u7528 --module-source-path
+
+# 0: name, 1: name
+compiler.err.file.patched.and.msp=\u53EF\u4ECE --patch-module \u548C --module-source-path \u8BBF\u95EE\u6587\u4EF6, \u4F46\u8BE5\u6587\u4EF6\u5728\u6BCF\u4E2A\u8DEF\u5F84\u4E2D\u5C5E\u4E8E\u4E0D\u540C\u7684\u6A21\u5757: {0}, {1}
compiler.err.processorpath.no.processormodulepath=-processorpath \u4E0E --processor-module-path \u7684\u7EC4\u5408\u975E\u6CD5
@@ -2120,6 +2147,15 @@
compiler.err.addmods.all.module.path.invalid=--add-modules ALL-MODULE-PATH \u53EA\u80FD\u5728\u7F16\u8BD1\u672A\u547D\u540D\u6A21\u5757\u65F6\u4F7F\u7528
+# 0: symbol
+compiler.err.add.exports.with.release=\u4E0D\u5141\u8BB8\u5728\u4F7F\u7528 --release \u65F6\u4ECE\u7CFB\u7EDF\u6A21\u5757 {0} \u5BFC\u51FA\u7A0B\u5E8F\u5305:
+
+# 0: symbol
+compiler.err.add.reads.with.release=\u4E0D\u5141\u8BB8\u5728\u4F7F\u7528 --release \u65F6\u4E3A\u7CFB\u7EDF\u6A21\u5757 {0} \u6DFB\u52A0\u8BFB\u53D6\u7EF4\u8FB9:
+
+# 0: symbol
+compiler.err.patch.module.with.release=\u4E0D\u5141\u8BB8\u5728\u4F7F\u7528 --release \u65F6\u4E3A\u7CFB\u7EDF\u6A21\u5757 {0} \u6253\u8865\u4E01
+
compiler.warn.addopens.ignored=--add-opens \u5728\u7F16\u8BD1\u65F6\u6CA1\u6709\u4EFB\u4F55\u6548\u679C
compiler.misc.locn.module_source_path=\u6A21\u5757\u6E90\u8DEF\u5F84