Merge

Fri, 18 Mar 2011 11:00:10 -0700

author
lana
date
Fri, 18 Mar 2011 11:00:10 -0700
changeset 938
e286ec0df754
parent 937
a2399c8db703
parent 921
9d0a61ac567b
child 939
ed0f7f1f9511
child 942
148d3dc4e1e1

Merge

src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Wed Mar 16 17:21:52 2011 -0700
     1.2 +++ b/.hgtags	Fri Mar 18 11:00:10 2011 -0700
     1.3 @@ -107,3 +107,5 @@
     1.4  7a98db8cbfce77a619057aa4fdde69d2a06d4101 jdk7-b130
     1.5  67221b8643b478c4fceacc89240db876455aae76 jdk7-b131
     1.6  e3d011d59a33acef79eff7523bef069557e91002 jdk7-b132
     1.7 +e77e98f936e83d94c9b56cc7af218dc822a06122 jdk7-b133
     1.8 +3d7acdbb72cab55deedfd35f60d4732abc9d6ac4 jdk7-b134
     2.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties	Wed Mar 16 17:21:52 2011 -0700
     2.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties	Fri Mar 18 11:00:10 2011 -0700
     2.3 @@ -11,15 +11,25 @@
     2.4  doclet.Interface_Hierarchy=Interface Hierarchy
     2.5  doclet.Enum_Hierarchy=Enum Hierarchy
     2.6  doclet.Annotation_Type_Hierarchy=Annotation Type Hierarchy
     2.7 +# The following ALL CAPS words should be translated. It is used as "Previous" link on javadoc.
     2.8  doclet.Prev=PREV
     2.9 +# The following ALL CAPS words should be translated. It is used as "Next" link on javadoc.
    2.10  doclet.Next=NEXT
    2.11 +# The following ALL CAPS words should be translated. It is used as "Previous Class" link on javadoc.
    2.12  doclet.Prev_Class=PREV CLASS
    2.13 +# The following ALL CAPS words should be translated. It is used as "Next Class" link on javadoc.
    2.14  doclet.Next_Class=NEXT CLASS
    2.15 +# The following ALL CAPS words should be translated. It is used as "Previous Package" link on javadoc.
    2.16  doclet.Prev_Package=PREV PACKAGE
    2.17 +# The following ALL CAPS words should be translated. It is used as "Next Package" link on javadoc.
    2.18  doclet.Next_Package=NEXT PACKAGE
    2.19 +# The following ALL CAPS words should be translated. It is used as "Previous Letter" link on javadoc alphabetical index.
    2.20  doclet.Prev_Letter=PREV LETTER
    2.21 +# The following ALL CAPS words should be translated. It is used as "Next Letter" link on javadoc alphabetical index.
    2.22  doclet.Next_Letter=NEXT LETTER
    2.23 +# The following ALL CAPS words should be translated. It is used as "Show List" link on javadoc.
    2.24  doclet.Show_Lists=SHOW LISTS
    2.25 +# The following ALL CAPS words should be translated. It is used as "Hide List" link on javadoc.
    2.26  doclet.Hide_Lists=HIDE LISTS
    2.27  doclet.Href_Class_Title=class in {0}
    2.28  doclet.Href_Interface_Title=interface in {0}
    2.29 @@ -27,16 +37,27 @@
    2.30  doclet.Href_Enum_Title=enum in {0}
    2.31  doclet.Href_Type_Param_Title=type parameter in {0}
    2.32  doclet.Href_Class_Or_Interface_Title=class or interface in {0}
    2.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.
    2.34  doclet.Summary=SUMMARY:
    2.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.
    2.36  doclet.Detail=DETAIL:
    2.37 +# The following ALL CAPS words should be translated. It is used as "Nested" (Nested Class Summary) link on javadoc.
    2.38  doclet.navNested=NESTED
    2.39 +# The following ALL CAPS words should be translated. It is used as "Optional" (Optional Element Summary) link on javadoc.
    2.40  doclet.navAnnotationTypeOptionalMember=OPTIONAL
    2.41 +# The following ALL CAPS words should be translated. It is used as "Required" (Required Element Summary) link on javadoc.
    2.42  doclet.navAnnotationTypeRequiredMember=REQUIRED
    2.43 +# The following ALL CAPS words should be translated. It is used as "Element" (Required Element Summary) link on javadoc.
    2.44  doclet.navAnnotationTypeMember=ELEMENT
    2.45 +# The following ALL CAPS words should be translated. It is used as "Field" (Field Detail) link on javadoc.
    2.46  doclet.navField=FIELD
    2.47 +# The following ALL CAPS words should be translated. It is used as "Enum Constants" link on javadoc.
    2.48  doclet.navEnum=ENUM CONSTANTS
    2.49 +# The following ALL CAPS words should be translated. It is used as "Constructor" (Constructor Detail) link on javadoc.
    2.50  doclet.navConstructor=CONSTR
    2.51 +# The following ALL CAPS words should be translated. It is used as "Method" (Method Detail) link on javadoc.
    2.52  doclet.navMethod=METHOD
    2.53 +# The following resource does not seem to be used anymore.
    2.54  doclet.navFactoryMethod=FACTORY
    2.55  doclet.Index=Index
    2.56  doclet.Window_Single_Index=Index
    2.57 @@ -45,8 +66,11 @@
    2.58  doclet.Skip_navigation_links=Skip navigation links
    2.59  doclet.New_Page=NewPage
    2.60  doclet.None=None
    2.61 +# The following resource does not seem to be used anymore
    2.62  doclet.CLASSES=CLASSES
    2.63 +# The following resource does not seem to be used anymore
    2.64  doclet.MEMBERS=MEMBERS
    2.65 +# The following resource does not seem to be used anymore
    2.66  doclet.NONE=NONE
    2.67  doclet.Factory_Method_Detail=Static Factory Method Detail
    2.68  doclet.navDeprecated=Deprecated
    2.69 @@ -112,7 +136,9 @@
    2.70  doclet.Option=Option
    2.71  doclet.Or=Or
    2.72  doclet.Frames=Frames
    2.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.
    2.74  doclet.FRAMES=FRAMES
    2.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.
    2.76  doclet.NO_FRAMES=NO FRAMES
    2.77  doclet.Package_Hierarchies=Package Hierarchies:
    2.78  doclet.Hierarchy_For_Package=Hierarchy For Package {0}

mercurial