diff -r 737185f3300f -r 06e06ec0d6f2 src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties	Thu Apr 08 17:03:01 2010 -0700
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties	Sun Apr 11 23:24:24 2010 -0700
@@ -11,10 +11,8 @@
 doclet.Class_0_extends_implements_serializable=\u7c7b {0} \u7ee7\u627f {1} \u5b9e\u73b0 Serializable
 doclet.Option_conflict=\u9009\u9879 {0} \u4e0e {1} \u51b2\u7a81
 doclet.Option_reuse=\u91cd\u590d\u4f7f\u7528\u7684\u9009\u9879\uff1a {0}
-doclet.exception_encountered= \u5c1d\u8bd5\u521b\u5efa\u6587\u4ef6 {1} \u65f6 \n\
-\t\u9047\u5230 {0}
-doclet.perform_copy_exception_encountered= \u6267\u884c\u590d\u5236\u65f6 \n\
-\u9047\u5230{0} \u3002
+doclet.exception_encountered= \u5c1d\u8bd5\u521b\u5efa\u6587\u4ef6 {1} \u65f6 \n\t\u9047\u5230 {0}
+doclet.perform_copy_exception_encountered= \u6267\u884c\u590d\u5236\u65f6 \n\u9047\u5230{0} \u3002
 doclet.File_not_found=\u627e\u4e0d\u5230\u6587\u4ef6\uff1a {0}
 doclet.Copy_Overwrite_warning=\u672a\u5c06\u6587\u4ef6 {0} \u590d\u5236\u5230 {1}\uff0c\u56e0\u4e3a\u73b0\u6709\u6587\u4ef6\u5177\u6709\u76f8\u540c\u540d\u79f0...
 doclet.Copying_File_0_To_Dir_1=\u6b63\u5728\u5c06\u6587\u4ef6 {0} \u590d\u5236\u5230\u76ee\u5f55 {1}...
@@ -81,6 +79,8 @@
 doclet.Exceptions=\u5f02\u5e38
 doclet.Errors=\u9519\u8bef
 doclet.Classes=\u7c7b
+doclet.Packages=\u8f6f\u4ef6\u5305
+doclet.packages=\u8f6f\u4ef6\u5305
 doclet.All_Classes=\u6240\u6709\u7c7b
 doclet.All_Superinterfaces=\u6240\u6709\u8d85\u7ea7\u63a5\u53e3\uff1a
 doclet.All_Implemented_Interfaces=\u6240\u6709\u5df2\u5b9e\u73b0\u7684\u63a5\u53e3\uff1a
@@ -91,14 +91,20 @@
 doclet.Class=\u7c7b
 doclet.AnnotationType=\u6ce8\u91ca\u7c7b\u578b
 doclet.annotationtype=\u6ce8\u91ca\u7c7b\u578b
+doclet.annotationtypes=\u6ce8\u91ca\u7c7b\u578b
 doclet.Enum=\u679a\u4e3e
 doclet.enum=\u679a\u4e3e
+doclet.enums=\u679a\u4e3e
 doclet.interface=\u63a5\u53e3
+doclet.interfaces=\u63a5\u53e3
 doclet.class=\u7c7b
+doclet.classes=\u7c7b
 doclet.Error=\u9519\u8bef
 doclet.error=\u9519\u8bef
+doclet.errors=\u9519\u8bef
 doclet.Exception=\u5f02\u5e38
 doclet.exception=\u5f02\u5e38
+doclet.exceptions=\u5f02\u5e38
 doclet.extended_by=\u7ee7\u627f\u8005
 doclet.extends=\u7ee7\u627f
 doclet.Package_private=\uff08\u4e13\u7528\u8f6f\u4ef6\u5305\uff09
@@ -124,27 +130,34 @@
 doclet.value_tag_invalid_constant=@value \u6807\u8bb0\uff08\u5f15\u7528 {0}\uff09\u53ea\u80fd\u5728\u5e38\u91cf\u4e2d\u4f7f\u7528\u3002
 doclet.dest_dir_create=\u6b63\u5728\u521b\u5efa\u76ee\u6807\u76ee\u5f55\uff1a "{0}"
 doclet.in={1} \u4e2d\u7684 {0}
+doclet.Use_Table_Summary=\u4f7f\u7528\u8868\u683c\uff0c\u5217\u51fa {0} \u548c\u8bf4\u660e
+doclet.Constants_Table_Summary={0} \u8868\u683c\uff0c\u5217\u51fa\u5e38\u91cf\u5b57\u6bb5\u548c\u503c
+doclet.Member_Table_Summary={0} \u8868\u683c\uff0c\u5217\u51fa {1} \u548c\u8bf4\u660e
+doclet.fields=\u5b57\u6bb5
+doclet.constructors=\u6784\u9020\u51fd\u6570
+doclet.methods=\u65b9\u6cd5
+doclet.annotation_type_optional_members=\u53ef\u9009\u5143\u7d20
+doclet.annotation_type_required_members=\u5fc5\u9700\u5143\u7d20
+doclet.enum_constants=\u679a\u4e3e\u5e38\u91cf
+doclet.nested_classes=\u5d4c\u5957\u7c7b
+doclet.subclasses=\u5b50\u7c7b
+doclet.subinterfaces=\u5b50\u63a5\u53e3
+doclet.Modifier=\u4fee\u9970\u7b26
+doclet.Type=\u7c7b\u578b
+doclet.Field=\u5b57\u6bb5
+doclet.Constructor=\u6784\u9020\u51fd\u6570
+doclet.Method=\u65b9\u6cd5
+doclet.Annotation_Type_Optional_Member=\u53ef\u9009\u5143\u7d20
+doclet.Annotation_Type_Required_Member=\u5fc5\u9700\u5143\u7d20
+doclet.Annotation_Type_Member=\u6ce8\u91ca\u7c7b\u578b\u5143\u7d20
+doclet.Enum_Constant=\u679a\u4e3e\u5e38\u91cf
+doclet.Class=\u7c7b
+doclet.Description=\u63cf\u8ff0
+doclet.ConstantField=\u5e38\u91cf\u5b57\u6bb5
+doclet.Value=\u503c
+doclet.0_and_1={0} \u548c {1}
 
 #Documentation for Enums
-doclet.enum_values_doc=\n\
- \u6309\u7167\u58f0\u660e\u8be5\u679a\u4e3e\u7c7b\u578b\u7684\u5e38\u91cf\u7684\u987a\u5e8f\uff0c\u8fd4\u56de\n\
- \u5305\u542b\u8fd9\u4e9b\u5e38\u91cf\u7684\u6570\u7ec4\u3002\u8be5\u65b9\u6cd5\u53ef\u7528\u4e8e\u8fed\u4ee3\n\
- \u5e38\u91cf\uff0c\u5982\u4e0b\u6240\u793a\uff1a\n\
- <pre>\n\
- for ({0} c : {0}.values())\n\
- &nbsp;   System.out.println(c);\n\
- </pre>\n\
- @\u6309\u7167\u58f0\u660e\u8be5\u679a\u4e3e\u7c7b\u578b\u7684\u5e38\u91cf\u7684\u987a\u5e8f\uff0c\u8fd4\u56de\n\
- \u5305\u542b\u8fd9\u4e9b\u5e38\u91cf\u7684\u6570\u7ec4
+doclet.enum_values_doc=\n\u6309\u7167\u58f0\u660e\u8be5\u679a\u4e3e\u7c7b\u578b\u7684\u5e38\u91cf\u7684\u987a\u5e8f\uff0c\u8fd4\u56de\n\u5305\u542b\u8fd9\u4e9b\u5e38\u91cf\u7684\u6570\u7ec4\u3002\u8be5\u65b9\u6cd5\u53ef\u7528\u4e8e\u8fed\u4ee3\n\u5e38\u91cf\uff0c\u5982\u4e0b\u6240\u793a\uff1a\n<pre>\nfor ({0} c : {0}.values())\n&nbsp;   System.out.println(c);\n</pre>\n@\u6309\u7167\u58f0\u660e\u8be5\u679a\u4e3e\u7c7b\u578b\u7684\u5e38\u91cf\u7684\u987a\u5e8f\uff0c\u8fd4\u56de\n\u5305\u542b\u8fd9\u4e9b\u5e38\u91cf\u7684\u6570\u7ec4
 
-doclet.enum_valueof_doc=\n\
- \u8fd4\u56de\u5e26\u6709\u6307\u5b9a\u540d\u79f0\u7684\u8be5\u7c7b\u578b\u7684\u679a\u4e3e\u5e38\u91cf\u3002\n\
- \u5b57\u7b26\u4e32\u5fc5\u987b\u4e0e\u7528\u4e8e\u58f0\u660e\u8be5\u7c7b\u578b\u7684\u679a\u4e3e\u5e38\u91cf\u7684\n\
- \u6807\u8bc6\u7b26<I>\u5b8c\u5168</I>\u5339\u914d\u3002\uff08\u4e0d\u5141\u8bb8\u6709\u591a\u4f59\n\
- \u7684\u7a7a\u683c\u3002\uff09\n\
-  \n\
- @param name \u8981\u8fd4\u56de\u7684\u679a\u4e3e\u5e38\u91cf\u7684\u540d\u79f0\u3002\n\
- @return \u8fd4\u56de\u5e26\u6709\u6307\u5b9a\u540d\u79f0\u7684\u679a\u4e3e\u5e38\u91cf\n\
- @throws \u5982\u679c\u8be5\u679a\u4e3e\u7c7b\u578b\u6ca1\u6709\u5e26\u6709\u6307\u5b9a\u540d\u79f0\u7684\u5e38\u91cf\uff0c\n\
- \u5219\u629b\u51fa IllegalArgumentException
- @throws \u5982\u679c\u53c2\u6570\u4e3a\u7a7a\u5219\u629b\u51fa NullPointerException
+doclet.enum_valueof_doc=\n\u8fd4\u56de\u5e26\u6709\u6307\u5b9a\u540d\u79f0\u7684\u8be5\u7c7b\u578b\u7684\u679a\u4e3e\u5e38\u91cf\u3002\n\u5b57\u7b26\u4e32\u5fc5\u987b\u4e0e\u7528\u4e8e\u58f0\u660e\u8be5\u7c7b\u578b\u7684\u679a\u4e3e\u5e38\u91cf\u7684\n\u6807\u8bc6\u7b26<I>\u5b8c\u5168</I>\u5339\u914d\u3002\uff08\u4e0d\u5141\u8bb8\u6709\u591a\u4f59\n\u7684\u7a7a\u683c\u3002\uff09\n\n@param name \u8981\u8fd4\u56de\u7684\u679a\u4e3e\u5e38\u91cf\u7684\u540d\u79f0\u3002\n@return \u8fd4\u56de\u5e26\u6709\u6307\u5b9a\u540d\u79f0\u7684\u679a\u4e3e\u5e38\u91cf\n@throws \u5982\u679c\u8be5\u679a\u4e3e\u7c7b\u578b\u6ca1\u6709\u5e26\u6709\u6307\u5b9a\u540d\u79f0\u7684\u5e38\u91cf\uff0c\n\u5219\u629b\u51fa IllegalArgumentException