Mercurial > hg > release > icedtea7-forest-2.6 > langtools
changeset 2252:b9574421d8b2
Merge jdk7u171-b00
| author | andrew |
|---|---|
| date | Tue, 06 Feb 2018 19:53:03 +0000 |
| parents | 12a7c021f31d (current diff) 89a92f5cd9c1 (diff) |
| children | 39cb684529cd |
| files | .hgtags |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Feb 05 22:41:19 2018 +0000 +++ b/.hgtags Tue Feb 06 19:53:03 2018 +0000 @@ -679,3 +679,4 @@ 6f72d747fa58d54e2d2e27755c0bcf2c7291682f jdk7u161-b00 e162e8d76cdd9f579e25f307f5485550fec2d024 jdk7u161-b01 b87dbe0db6aa70ffb0443b5ef55e696e0ec5b124 icedtea-2.6.12 +551dfae6260d4cd2cd929e14934b031d9319ad52 jdk7u171-b00
--- a/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties Mon Feb 05 22:41:19 2018 +0000 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties Tue Feb 06 19:53:03 2018 +0000 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -496,7 +496,7 @@ compiler.err.repeated.modifier=\u4FEE\u9970\u7B26\u91CD\u590D # 0: symbol, 1: set of modifier, 2: symbol -compiler.err.report.access={0}\u53EF\u4EE5\u5728{2}\u4E2D\u8BBF\u95EE{1} +compiler.err.report.access={0} \u5728 {2} \u4E2D\u662F {1} \u8BBF\u95EE\u63A7\u5236 compiler.err.ret.outside.meth=\u8FD4\u56DE\u5916\u90E8\u65B9\u6CD5