--- old/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties	Fri Mar 22 15:42:52 2013
+++ new/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties	Fri Mar 22 15:42:51 2013
@@ -16,6 +16,7 @@
 # Many of strings in this file are used by widgets that have a
 # mnemonic, for example:
 #   ColorChooser.rgbNameTextAndMnemonic=R&GB
+#
 # Indicates that the tab in the ColorChooser for RGB colors will have
 # the text 'RGB', further the mnemonic character will be 'g' and that
 # a decoration will be provided under the 'G'. This will typically
@@ -30,7 +31,7 @@
 # @author Steve Wilson
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=普通的文件
+FileChooser.fileDescription.textAndMnemonic=通用文件
 FileChooser.directoryDescription.textAndMnemonic=目录
 FileChooser.newFolderError.textAndMnemonic=创建新的文件夹时出错
 FileChooser.newFolderErrorSeparator= :
@@ -69,8 +70,8 @@
 FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser 帮助
 FileChooser.directoryOpenButtonToolTip.textAndMnemonic=打开选择的目录
 
-FileChooser.filesListAccessibleName=Files List
-FileChooser.filesDetailsAccessibleName=Files Details
+FileChooser.filesListAccessibleName=文件列表
+FileChooser.filesDetailsAccessibleName=文件详细信息
 
 ############ COLOR CHOOSER STRINGS #############
 ColorChooser.preview.textAndMnemonic=预览
@@ -78,19 +79,19 @@
 ColorChooser.cancel.textAndMnemonic=取消
 ColorChooser.reset.textAndMnemonic=重置(&R)
 ColorChooser.sample.textAndMnemonic=示例文本  示例文本
-ColorChooser.swatches.textAndMnemonic=示例(&S)
+ColorChooser.swatches.textAndMnemonic=样本(&S)
 ColorChooser.swatchesRecent.textAndMnemonic=最近:
-ColorChooser.hsv.textAndMnemonic=&HSV
+ColorChooser.hsv.textAndMnemonic=HSV(&H)
 ColorChooser.hsvHue.textAndMnemonic=色调
 ColorChooser.hsvSaturation.textAndMnemonic=饱和度
 ColorChooser.hsvValue.textAndMnemonic=值
 ColorChooser.hsvTransparency.textAndMnemonic=透明度
-ColorChooser.hsl.textAndMnemonic=HS&L
+ColorChooser.hsl.textAndMnemonic=HSL(&L)
 ColorChooser.hslHue.textAndMnemonic=色调
 ColorChooser.hslSaturation.textAndMnemonic=饱和度
 ColorChooser.hslLightness.textAndMnemonic=亮度
 ColorChooser.hslTransparency.textAndMnemonic=透明度
-ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgb.textAndMnemonic=RGB(&G)
 ColorChooser.rgbRed.textAndMnemonic=红色(&D)
 ColorChooser.rgbGreen.textAndMnemonic=绿色(&N)
 ColorChooser.rgbBlue.textAndMnemonic=蓝色(&B)
@@ -108,8 +109,10 @@
 # define mnemonics for any of the buttons.
 OptionPane.yesButton.textAndMnemonic=是(&Y)
 OptionPane.noButton.textAndMnemonic=否(&N)
-OptionPane.okButton.textAndMnemonic=确定(&O)
+OptionPane.okButton.textAndMnemonic=确定
+#OptionPane.okButtonMnemonic=0
 OptionPane.cancelButton.textAndMnemonic=取消
+#OptionPane.cancelButtonMnemonic=0
 OptionPane.title.textAndMnemonic=选择一个选项
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
@@ -150,7 +153,7 @@
 ############ Text strings #############
 # Used for html forms
 FormView.submitButton.textAndMnemonic=提交查询
-FormView.resetButton.textAndMnemonic=重设
+FormView.resetButton.textAndMnemonic=重置
 FormView.browseFileButton.textAndMnemonic=浏览...
 
 ############ Abstract Document Strings ############
@@ -177,10 +180,9 @@
 SplitPane.leftButton.textAndMnemonic=左键
 SplitPane.rightButton.textAndMnemonic=右键
 # Used for Isindex
-IsindexView.prompt=这是可搜索索引。请输入搜索关键字:
+IsindexView.prompt=这是可搜索索引。请输入搜索关键字: 
 
 ############ InternalFrameTitlePane Strings ############
 InternalFrameTitlePane.iconifyButtonAccessibleName=图标化
 InternalFrameTitlePane.maximizeButtonAccessibleName=最大化
 InternalFrameTitlePane.closeButtonAccessibleName=关闭
-