# HG changeset patch # User asaha # Date 1392168682 28800 # Node ID 3d5b1499187ba133448be4b1c61f1ececfe8b631 # Parent f367f26cbef1a876fd53785c3eac417ddefda511# Parent 169c8c1a2e8d1e80a4474d91f7809aa2a6b2249a Merge diff -r f367f26cbef1 -r 3d5b1499187b .hgtags --- 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 diff -r f367f26cbef1 -r 3d5b1499187b src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties --- 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 diff -r f367f26cbef1 -r 3d5b1499187b src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties --- 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 diff -r f367f26cbef1 -r 3d5b1499187b src/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties --- 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