Merge

Wed, 15 Dec 2010 15:30:12 -0800

author
ohair
date
Wed, 15 Dec 2010 15:30:12 -0800
changeset 764
a0331c79cea9
parent 760
11e7b4c0476e
parent 763
d9deecf9181b
child 765
98570f7ba610

Merge

     1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties	Thu Dec 09 21:25:38 2010 -0800
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties	Wed Dec 15 15:30:12 2010 -0800
     1.3 @@ -130,7 +130,7 @@
     1.4  doclet.Standard_doclet_invoked=\u5df2\u8c03\u7528\u7684\u6807\u51c6 doclet...
     1.5  doclet.No_Non_Deprecated_Classes_To_Document=\u627e\u4e0d\u5230\u53ef\u4ee5\u6587\u6863\u5316\u7684\u672a\u8fc7\u65f6\u7684\u7c7b\u3002
     1.6  doclet.Interfaces_Italic=\u63a5\u53e3\uff08\u659c\u4f53\uff09
     1.7 -doclet.Enclosing_Class=\u6b63\u5728\u5c01\u95ed\u7c7b\uff1a
     1.8 +doclet.Enclosing_Class=\u5305\u5bb9\u7c7b\uff1a
     1.9  doclet.Enclosing_Interface=\u6b63\u5728\u5c01\u95ed\u63a5\u53e3\uff1a
    1.10  doclet.Help_title=API \u5e2e\u52a9
    1.11  doclet.Window_Help_title=API \u5e2e\u52a9

mercurial