# HG changeset patch
# User ohair
# Date 1292558221 28800
# Node ID 98570f7ba610863a11b152c63eedc773962c07d1
# Parent  9968ce958706146fe8c23d2099dc8f8da1232f45# Parent  a0331c79cea9c6790fe0e19f36f06ba022e37011
Merge

diff -r 9968ce958706 -r 98570f7ba610 src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties
--- a/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties	Thu Dec 16 18:18:18 2010 -0800
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties	Thu Dec 16 19:57:01 2010 -0800
@@ -130,7 +130,7 @@
 doclet.Standard_doclet_invoked=\u5df2\u8c03\u7528\u7684\u6807\u51c6 doclet...
 doclet.No_Non_Deprecated_Classes_To_Document=\u627e\u4e0d\u5230\u53ef\u4ee5\u6587\u6863\u5316\u7684\u672a\u8fc7\u65f6\u7684\u7c7b\u3002
 doclet.Interfaces_Italic=\u63a5\u53e3\uff08\u659c\u4f53\uff09
-doclet.Enclosing_Class=\u6b63\u5728\u5c01\u95ed\u7c7b\uff1a
+doclet.Enclosing_Class=\u5305\u5bb9\u7c7b\uff1a
 doclet.Enclosing_Interface=\u6b63\u5728\u5c01\u95ed\u63a5\u53e3\uff1a
 doclet.Help_title=API \u5e2e\u52a9
 doclet.Window_Help_title=API \u5e2e\u52a9