changeset 868:8859e49909e6

Merge
author lana
date Wed, 22 Dec 2010 23:15:17 -0800
parents 7c33098600b2 659417e931fe
children dd38bab326a3
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Dec 21 16:29:10 2010 -0800
+++ b/.hgtags	Wed Dec 22 23:15:17 2010 -0800
@@ -96,3 +96,5 @@
 814561077c448292f78de461b6de5d78d57c2089 jdk7-b119
 1dd813a529cfa06d850ee7dc42da42efb8f6af0e jdk7-b120
 1bf969e9792f977a8593496681539840a54fe644 jdk7-b121
+11e7b4c0476e4d6085d8d28c4aa2833d46714a2a jdk7-b122
+a3b5b531542a372f30e014b1543a619a15a90780 jdk7-b123
--- a/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties	Tue Dec 21 16:29:10 2010 -0800
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties	Wed Dec 22 23:15:17 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