Mercurial > hg > release > icedtea7-forest-2.6 > langtools
changeset 2280:f59ea8a82b17
Merge jdk7u211-b01
author | andrew |
---|---|
date | Fri, 22 Feb 2019 06:16:01 +0000 |
parents | c9fee0801286 (current diff) b22fd0eed3e1 (diff) |
children | 6cdbf382f3e2 |
files | .hgtags |
diffstat | 3 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Feb 21 04:50:23 2019 +0000 +++ b/.hgtags Fri Feb 22 06:16:01 2019 +0000 @@ -695,3 +695,5 @@ f1f14c413b20f1d4abef840d65587d2839f6cfdf jdk7u201-b00 1b532e3cc1da0b36b43fa03a28ec10a08e83523a icedtea-2.6.16 8e1ace09837f1310ccfc5cb5d42ca8a1017485d0 icedtea-2.6.17pre01 +353ea2f317ff940242316d0069c2239d178bd7d3 jdk7u211-b00 +b8196c545f3e11c704c020d89a4e61cea54fb4f7 jdk7u211-b01
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties Thu Feb 21 04:50:23 2019 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties Fri Feb 22 06:16:01 2019 +0000 @@ -84,7 +84,7 @@ doclet.Method_Summary=\u30E1\u30BD\u30C3\u30C9\u306E\u30B5\u30DE\u30EA\u30FC doclet.Factory_Method_Summary=static\u30D5\u30A1\u30AF\u30C8\u30EA\u30FB\u30E1\u30BD\u30C3\u30C9\u306E\u30B5\u30DE\u30EA\u30FC doclet.Interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 -doclet.Enums=\u5217\u6319\u578B +doclet.Enums=\u5217\u6319 doclet.AnnotationTypes=\u6CE8\u91C8\u578B doclet.Exceptions=\u4F8B\u5916 doclet.Errors=\u30A8\u30E9\u30FC @@ -102,9 +102,9 @@ doclet.AnnotationType=\u6CE8\u91C8\u578B doclet.annotationtype=\u6CE8\u91C8\u578B doclet.annotationtypes=\u6CE8\u91C8\u578B -doclet.Enum=\u5217\u6319\u578B -doclet.enum=\u5217\u6319\u578B -doclet.enums=\u5217\u6319\u578B +doclet.Enum=\u5217\u6319 +doclet.enum=\u5217\u6319 +doclet.enums=\u5217\u6319 doclet.interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 doclet.interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 doclet.class=\u30AF\u30E9\u30B9
--- a/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Thu Feb 21 04:50:23 2019 +0000 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Fri Feb 22 06:16:01 2019 +0000 @@ -1244,7 +1244,7 @@ compiler.misc.kindname.constructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF -compiler.misc.kindname.enum=\u5217\u6319\u578B +compiler.misc.kindname.enum=\u5217\u6319 compiler.misc.kindname.interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9