Merge jdk7-b134

Tue, 15 Mar 2011 15:32:21 -0700

author
ohair
date
Tue, 15 Mar 2011 15:32:21 -0700
changeset 920
3d7acdbb72ca
parent 917
d7dfa105f159
parent 919
654336cabc5a
child 921
9d0a61ac567b

Merge

     1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties	Thu Mar 10 20:51:07 2011 -0800
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties	Tue Mar 15 15:32:21 2011 -0700
     1.3 @@ -11,15 +11,25 @@
     1.4  doclet.Interface_Hierarchy=Interface Hierarchy
     1.5  doclet.Enum_Hierarchy=Enum Hierarchy
     1.6  doclet.Annotation_Type_Hierarchy=Annotation Type Hierarchy
     1.7 +# The following ALL CAPS words should be translated. It is used as "Previous" link on javadoc.
     1.8  doclet.Prev=PREV
     1.9 +# The following ALL CAPS words should be translated. It is used as "Next" link on javadoc.
    1.10  doclet.Next=NEXT
    1.11 +# The following ALL CAPS words should be translated. It is used as "Previous Class" link on javadoc.
    1.12  doclet.Prev_Class=PREV CLASS
    1.13 +# The following ALL CAPS words should be translated. It is used as "Next Class" link on javadoc.
    1.14  doclet.Next_Class=NEXT CLASS
    1.15 +# The following ALL CAPS words should be translated. It is used as "Previous Package" link on javadoc.
    1.16  doclet.Prev_Package=PREV PACKAGE
    1.17 +# The following ALL CAPS words should be translated. It is used as "Next Package" link on javadoc.
    1.18  doclet.Next_Package=NEXT PACKAGE
    1.19 +# The following ALL CAPS words should be translated. It is used as "Previous Letter" link on javadoc alphabetical index.
    1.20  doclet.Prev_Letter=PREV LETTER
    1.21 +# The following ALL CAPS words should be translated. It is used as "Next Letter" link on javadoc alphabetical index.
    1.22  doclet.Next_Letter=NEXT LETTER
    1.23 +# The following ALL CAPS words should be translated. It is used as "Show List" link on javadoc.
    1.24  doclet.Show_Lists=SHOW LISTS
    1.25 +# The following ALL CAPS words should be translated. It is used as "Hide List" link on javadoc.
    1.26  doclet.Hide_Lists=HIDE LISTS
    1.27  doclet.Href_Class_Title=class in {0}
    1.28  doclet.Href_Interface_Title=interface in {0}
    1.29 @@ -27,16 +37,27 @@
    1.30  doclet.Href_Enum_Title=enum in {0}
    1.31  doclet.Href_Type_Param_Title=type parameter in {0}
    1.32  doclet.Href_Class_Or_Interface_Title=class or interface in {0}
    1.33 +# The following ALL CAPS words should be translated. It's used as SUMMARY: NESTED | FIELD | CONSTR | METHOD, meaning Nested Class Summary, Field Summary, Constructor Summary, or Method Summary.
    1.34  doclet.Summary=SUMMARY:
    1.35 +# The following ALL CAPS words should be translated. It is used as DETAIL: FIELD | CONSTR | METHOD, meaning Field Detail, Constructor Detail, or Method Detail.
    1.36  doclet.Detail=DETAIL:
    1.37 +# The following ALL CAPS words should be translated. It is used as "Nested" (Nested Class Summary) link on javadoc.
    1.38  doclet.navNested=NESTED
    1.39 +# The following ALL CAPS words should be translated. It is used as "Optional" (Optional Element Summary) link on javadoc.
    1.40  doclet.navAnnotationTypeOptionalMember=OPTIONAL
    1.41 +# The following ALL CAPS words should be translated. It is used as "Required" (Required Element Summary) link on javadoc.
    1.42  doclet.navAnnotationTypeRequiredMember=REQUIRED
    1.43 +# The following ALL CAPS words should be translated. It is used as "Element" (Required Element Summary) link on javadoc.
    1.44  doclet.navAnnotationTypeMember=ELEMENT
    1.45 +# The following ALL CAPS words should be translated. It is used as "Field" (Field Detail) link on javadoc.
    1.46  doclet.navField=FIELD
    1.47 +# The following ALL CAPS words should be translated. It is used as "Enum Constants" link on javadoc.
    1.48  doclet.navEnum=ENUM CONSTANTS
    1.49 +# The following ALL CAPS words should be translated. It is used as "Constructor" (Constructor Detail) link on javadoc.
    1.50  doclet.navConstructor=CONSTR
    1.51 +# The following ALL CAPS words should be translated. It is used as "Method" (Method Detail) link on javadoc.
    1.52  doclet.navMethod=METHOD
    1.53 +# The following resource does not seem to be used anymore.
    1.54  doclet.navFactoryMethod=FACTORY
    1.55  doclet.Index=Index
    1.56  doclet.Window_Single_Index=Index
    1.57 @@ -45,8 +66,11 @@
    1.58  doclet.Skip_navigation_links=Skip navigation links
    1.59  doclet.New_Page=NewPage
    1.60  doclet.None=None
    1.61 +# The following resource does not seem to be used anymore
    1.62  doclet.CLASSES=CLASSES
    1.63 +# The following resource does not seem to be used anymore
    1.64  doclet.MEMBERS=MEMBERS
    1.65 +# The following resource does not seem to be used anymore
    1.66  doclet.NONE=NONE
    1.67  doclet.Factory_Method_Detail=Static Factory Method Detail
    1.68  doclet.navDeprecated=Deprecated
    1.69 @@ -112,7 +136,9 @@
    1.70  doclet.Option=Option
    1.71  doclet.Or=Or
    1.72  doclet.Frames=Frames
    1.73 +# The following ALL CAPS words should be translated. It is used as "FRAMES" javadoc navigation link to indicate displaying the page with HTML frames.
    1.74  doclet.FRAMES=FRAMES
    1.75 +# The following ALL CAPS words should be translated. It is used as "NO FRAMES" javadoc navigation link to indicate displaying the page without HTML frames.
    1.76  doclet.NO_FRAMES=NO FRAMES
    1.77  doclet.Package_Hierarchies=Package Hierarchies:
    1.78  doclet.Hierarchy_For_Package=Hierarchy For Package {0}

mercurial