changeset 2291:3d5b1499187b

Merge
author asaha
date Tue, 11 Feb 2014 17:31:22 -0800
parents f367f26cbef1 169c8c1a2e8d
children 35b04ece3286
files
diffstat 5 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Feb 04 22:47:29 2014 -0800
+++ b/.hgtags	Tue Feb 11 17:31:22 2014 -0800
@@ -250,6 +250,7 @@
 ba24b63043626003929927f091e8b84190f39261 jdk8-b126
 bb69217ed81202b1a490dc7150dc7cd073689341 jdk8-b127
 09cdd3b493c0d13dc32206e5f12bb1a2f7465687 jdk8-b128
+8fe7202d3c38784f3f14368e3954fc4e0394afa4 jdk8-b129
 519557cab6d4a7fd77b33226e71f92303090420b jdk8u5-b01
 9003a59a512e6b764d8a3f805aadc3996a58e5bd jdk8u5-b02
 30e3dad0ebbdf3129bacd04a7f4cdecd3df92bb2 jdk8u5-b03
@@ -257,3 +258,4 @@
 c9db8c800797258540e0411e58b8f7d59273de5f jdk8u5-b05
 b1920c0b701d5ff219c9f622db5cafc9bf00d5c8 jdk8u5-b06
 180df7f2c078f1efaa6fcd8ca9f55dc5f81b182c jdk8u5-b07
+9c3d7d1a70391bd772693dc5a838b53e1cad0761 jdk8u5-b08
--- a/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties	Tue Feb 04 22:47:29 2014 -0800
+++ b/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties	Tue Feb 11 17:31:22 2014 -0800
@@ -419,8 +419,6 @@
 
 compiler.err.intf.expected.here=\u3053\u3053\u306B\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304C\u5FC5\u8981\u3067\u3059
 
-compiler.err.intf.or.array.expected.here=\u3053\u3053\u306B\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u307E\u305F\u306F\u914D\u5217\u578B\u304C\u5FC5\u8981\u3067\u3059
-
 compiler.err.intf.meth.cant.have.body=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u62BD\u8C61\u30E1\u30BD\u30C3\u30C9\u304C\u672C\u4F53\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
 
 # 0: symbol
--- a/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties	Tue Feb 04 22:47:29 2014 -0800
+++ b/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties	Tue Feb 11 17:31:22 2014 -0800
@@ -419,8 +419,6 @@
 
 compiler.err.intf.expected.here=\u6B64\u5904\u9700\u8981\u63A5\u53E3
 
-compiler.err.intf.or.array.expected.here=\u6B64\u5904\u9884\u671F\u4E3A\u63A5\u53E3\u6216\u6570\u7EC4\u7C7B\u578B
-
 compiler.err.intf.meth.cant.have.body=\u63A5\u53E3\u62BD\u8C61\u65B9\u6CD5\u4E0D\u80FD\u5E26\u6709\u4E3B\u4F53
 
 # 0: symbol
--- a/src/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties	Tue Feb 04 22:47:29 2014 -0800
+++ b/src/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties	Tue Feb 11 17:31:22 2014 -0800
@@ -29,8 +29,11 @@
 
 main.opt.dotoutput=\  -dotoutput <dir>                   DOT\u30D5\u30A1\u30A4\u30EB\u51FA\u529B\u306E\u5B9B\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
 
+main.opt.jdkinternals=\  -jdkinternals                      JDK\u5185\u90E8API\u306E\u30AF\u30E9\u30B9\u30EC\u30D9\u30EB\u306E\u4F9D\u5B58\u6027\u3092\u691C\u51FA\u3057\u307E\u3059\u3002\n                                     \u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001-include\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u306A\u3044\u3068\u3001\n                                     -classpath\u306E\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u3068\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u3092\u5206\u6790\u3057\u307E\u3059\u3002\n                                     \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F-p\u3001-e\u304A\u3088\u3073-s\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u4E00\u7DD2\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\n                                     \u8B66\u544A: JDK\u5185\u90E8API\u306F\u3001\u6B21\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u306A\u304F\u306A\u308B\u53EF\u80FD\u6027\u304C\n                                     \u3042\u308A\u307E\u3059\u3002
+
 main.opt.depth=\  -depth=<depth>                     \u63A8\u79FB\u7684\u306A\u4F9D\u5B58\u6027\u5206\u6790\u306E\u6DF1\u3055\u3092\n                                     \u6307\u5B9A\u3057\u307E\u3059
 
+
 err.unknown.option=\u4E0D\u660E\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
 err.missing.arg={0}\u306B\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 err.internal.error=\u5185\u90E8\u30A8\u30E9\u30FC: {0} {1} {2}
--- a/src/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties	Tue Feb 04 22:47:29 2014 -0800
+++ b/src/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties	Tue Feb 11 17:31:22 2014 -0800
@@ -29,8 +29,11 @@
 
 main.opt.dotoutput=\  -dotoutput <dir>                   DOT \u6587\u4EF6\u8F93\u51FA\u7684\u76EE\u6807\u76EE\u5F55
 
+main.opt.jdkinternals=\  -jdkinternals                      \u5728 JDK \u5185\u90E8 API \u4E0A\u67E5\u627E\u7C7B\u7EA7\u522B\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002\n                                     \u9ED8\u8BA4\u60C5\u51B5\u4E0B, \u5B83\u5206\u6790 -classpath \u4E0A\u7684\u6240\u6709\u7C7B\n                                     \u548C\u8F93\u5165\u6587\u4EF6, \u9664\u975E\u6307\u5B9A\u4E86 -include \u9009\u9879\u3002\n                                     \u6B64\u9009\u9879\u4E0D\u80FD\u4E0E -p, -e \u548C -s \u9009\u9879\u4E00\u8D77\u4F7F\u7528\u3002\n                                     \u8B66\u544A: \u5728\u4E0B\u4E00\u4E2A\u53D1\u884C\u7248\u4E2D\u53EF\u80FD\u65E0\u6CD5\u8BBF\u95EE\n                                     JDK \u5185\u90E8 API\u3002
+
 main.opt.depth=\  -depth=<depth>                     \u6307\u5B9A\u8FC7\u6E21\u88AB\u4F9D\u8D56\u5BF9\u8C61\u5206\u6790\n                                     \u7684\u6DF1\u5EA6
 
+
 err.unknown.option=\u672A\u77E5\u9009\u9879: {0}
 err.missing.arg=\u6CA1\u6709\u4E3A{0}\u6307\u5B9A\u503C
 err.internal.error=\u5185\u90E8\u9519\u8BEF: {0} {1} {2}