Mon, 17 Aug 2015 14:24:24 -0700
Merge
.hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Mon Aug 10 14:27:46 2015 -0700 1.2 +++ b/.hgtags Mon Aug 17 14:24:24 2015 -0700 1.3 @@ -464,10 +464,16 @@ 1.4 c80e74eb5aaa6abe74c7cf110a41290317bc4efb jdk8u65-b07 1.5 5e00d983801dd8764c7cdccdede6d026f6033b66 jdk8u65-b08 1.6 9a8c4add20b277917466d48398071e0965f3deee jdk8u65-b09 1.7 +f3f51e2bce4b243ab7abb9e83dfb20cc706939e8 jdk8u65-b10 1.8 +f3f51e2bce4b243ab7abb9e83dfb20cc706939e8 jdk8u65-b10 1.9 +0000000000000000000000000000000000000000 jdk8u65-b10 1.10 +0000000000000000000000000000000000000000 jdk8u65-b10 1.11 +f72616a2c088fb2918d730b4eeea6c86f84d1f04 jdk8u65-b10 1.12 d1febf79ce5ea41fb4b818ffd3589cf923e6de5f jdk8u66-b00 1.13 4c13b9cd06222be73b9c44607ae929b4818aed17 jdk8u66-b01 1.14 ec4e102b4bd02b08336e172047e70971a3ed7489 jdk8u66-b02 1.15 a765210439a2544a4570deda6d9400363cd18b48 jdk8u66-b07 1.16 8d4dc964a44ba0d55dccbcf7ac840f70bc523e20 jdk8u66-b08 1.17 93a0c0eb33d47c5a6f096dcf531ee062480e1cd7 jdk8u66-b09 1.18 +09600814af4e1dbf9de8e5bcec0316ec0bb92c20 jdk8u66-b10 1.19 aaad025819b721f7f291048a07cd1c144319b68d jdk8u71-b00
2.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties Mon Aug 10 14:27:46 2015 -0700 2.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties Mon Aug 17 14:24:24 2015 -0700 2.3 @@ -190,4 +190,4 @@ 2.4 2.5 2.6 # L10N: do not localize these words: all none accessibility html missing reference syntax 2.7 -doclet.X.usage=\u6A19\u6E96\u306Edoclet\u306B\u3088\u308A\u63D0\u4F9B\u3055\u308C\u308B\u3082\u306E:\n -Xdocrootparent <url> doc\u30B3\u30E1\u30F3\u30C8\u5185\u306E/..\u304C\u5F8C\u306B\u7D9A\u304F@docRoot\u306E\u3059\u3079\u3066\u3092\n <url>\u3067\u7F6E\u63DB\u3057\u307E\u3059\n -Xdoclint javadoc\u30B3\u30E1\u30F3\u30C8\u5185\u306E\u554F\u984C\u306B\u5BFE\u3059\u308B\u63A8\u5968\u3055\u308C\u308B\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n -Xdoclint:(all|none|[-]<group>) \n javadoc\u30B3\u30E1\u30F3\u30C8\u5185\u306E\u554F\u984C\u306B\u5BFE\u3059\u308B\u7279\u5B9A\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3057\u307E\u3059\u3002\n \u3053\u3053\u3067\u3001<group>\u306Fhtml\u3001missing\u3001reference\u307E\u305F\u306Fsyntax\u306E\u3044\u305A\u308C\u304B\u3067\u3059\u3002\n 2.8 +doclet.X.usage=\u6A19\u6E96\u306Edoclet\u306B\u3088\u308A\u63D0\u4F9B\u3055\u308C\u308B\u3082\u306E:\n -Xdocrootparent <url> doc\u30B3\u30E1\u30F3\u30C8\u5185\u306E/..\u304C\u5F8C\u306B\u7D9A\u304F@docRoot\u306E\u3059\u3079\u3066\u3092\n <url>\u3067\u7F6E\u63DB\u3057\u307E\u3059\n -Xdoclint javadoc\u30B3\u30E1\u30F3\u30C8\u5185\u306E\u554F\u984C\u306B\u5BFE\u3059\u308B\u63A8\u5968\u3055\u308C\u308B\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n -Xdoclint:(all|none|[-]<group>) \n javadoc\u30B3\u30E1\u30F3\u30C8\u5185\u306E\u554F\u984C\u306B\u5BFE\u3059\u308B\u7279\u5B9A\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3057\u307E\u3059\u3002\n \u3053\u3053\u3067\u3001<group>\u306Faccessibility\u3001html\u3001missing\u3001reference\u307E\u305F\u306Fsyntax\u306E\u3044\u305A\u308C\u304B\u3067\u3059\u3002\n
3.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties Mon Aug 10 14:27:46 2015 -0700 3.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties Mon Aug 17 14:24:24 2015 -0700 3.3 @@ -148,6 +148,13 @@ 3.4 doclet.Constructors=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF 3.5 doclet.methods=\u30E1\u30BD\u30C3\u30C9 3.6 doclet.Methods=\u30E1\u30BD\u30C3\u30C9 3.7 +doclet.All_Methods=\u3059\u3079\u3066\u306E\u30E1\u30BD\u30C3\u30C9 3.8 +doclet.Static_Methods=static\u30E1\u30BD\u30C3\u30C9 3.9 +doclet.Instance_Methods=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u30FB\u30E1\u30BD\u30C3\u30C9 3.10 +doclet.Abstract_Methods=abstract\u30E1\u30BD\u30C3\u30C9 3.11 +doclet.Concrete_Methods=concrete\u30E1\u30BD\u30C3\u30C9 3.12 +doclet.Default_Methods=\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30E1\u30BD\u30C3\u30C9 3.13 +doclet.Deprecated_Methods=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30E1\u30BD\u30C3\u30C9 3.14 doclet.annotation_type_optional_members=\u4EFB\u610F\u8981\u7D20 3.15 doclet.Annotation_Type_Optional_Members=\u4EFB\u610F\u8981\u7D20 3.16 doclet.annotation_type_required_members=\u5FC5\u9808\u8981\u7D20
4.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties Mon Aug 10 14:27:46 2015 -0700 4.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties Mon Aug 17 14:24:24 2015 -0700 4.3 @@ -148,6 +148,13 @@ 4.4 doclet.Constructors=\u6784\u9020\u5668 4.5 doclet.methods=\u65B9\u6CD5 4.6 doclet.Methods=\u65B9\u6CD5 4.7 +doclet.All_Methods=\u6240\u6709\u65B9\u6CD5 4.8 +doclet.Static_Methods=\u9759\u6001\u65B9\u6CD5 4.9 +doclet.Instance_Methods=\u5B9E\u4F8B\u65B9\u6CD5 4.10 +doclet.Abstract_Methods=\u62BD\u8C61\u65B9\u6CD5 4.11 +doclet.Concrete_Methods=\u5177\u4F53\u65B9\u6CD5 4.12 +doclet.Default_Methods=\u9ED8\u8BA4\u65B9\u6CD5 4.13 +doclet.Deprecated_Methods=\u5DF2\u8FC7\u65F6\u7684\u65B9\u6CD5 4.14 doclet.annotation_type_optional_members=\u53EF\u9009\u5143\u7D20 4.15 doclet.Annotation_Type_Optional_Members=\u53EF\u9009\u5143\u7D20 4.16 doclet.annotation_type_required_members=\u5FC5\u9700\u7684\u5143\u7D20