--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties	Thu Apr 21 09:42:59 2011 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties	Mon Apr 25 16:39:49 2011 -0700
@@ -79,5 +79,9 @@
 FileChooser.renameFileErrorTitle=Error 
 FileChooser.renameFileErrorText=Error renaming file "{0}" to "{1}"
 
+# dummy resource added for translation automation
+OptionPane.okButtonText=OK
 OptionPane.okButtonMnemonic=79
+# dummy resource added for translation automation
+OptionPane.cancelButtonText=Cancel
 OptionPane.cancelButtonMnemonic=67

--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties	Thu Apr 21 09:42:59 2011 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties	Mon Apr 25 16:39:49 2011 -0700
@@ -79,6 +79,10 @@
 FileChooser.renameFileErrorTitle=Fehler
 FileChooser.renameFileErrorText=Fehler beim Umbenennen der Datei "{0}" in "{1}"
 
+# dummy resource added for translation automation
+OptionPane.okButtonText=OK
 OptionPane.okButtonMnemonic=79
+# dummy resource added for translation automation
+OptionPane.cancelButtonText=Abbrechen
 OptionPane.cancelButtonMnemonic=65
 

--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties	Thu Apr 21 09:42:59 2011 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties	Mon Apr 25 16:39:49 2011 -0700
@@ -79,6 +79,10 @@
 FileChooser.renameFileErrorTitle=Error
 FileChooser.renameFileErrorText=Error al cambiar el nombre del archivo "{0}" a "{1}"
 
+# dummy resource added for translation automation
+OptionPane.okButtonText=Aceptar
 OptionPane.okButtonMnemonic=65
+# dummy resource added for translation automation
+OptionPane.cancelButtonText=Cancelar
 OptionPane.cancelButtonMnemonic=67
 

--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties	Thu Apr 21 09:42:59 2011 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties	Mon Apr 25 16:39:49 2011 -0700
@@ -79,6 +79,10 @@
 FileChooser.renameFileErrorTitle=Erreur
 FileChooser.renameFileErrorText=Erreur lors du changement de nom du fichier "{0}" en "{1}"
 
+# dummy resource added for translation automation
+OptionPane.okButtonText=OK
 OptionPane.okButtonMnemonic=79
+# dummy resource added for translation automation
+OptionPane.cancelButtonText=Annuler
 OptionPane.cancelButtonMnemonic=65
 

--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties	Thu Apr 21 09:42:59 2011 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties	Mon Apr 25 16:39:49 2011 -0700
@@ -79,6 +79,10 @@
 FileChooser.renameFileErrorTitle=Errore
 FileChooser.renameFileErrorText=Errore durante la ridenominazione del file "{0}" in "{1}"
 
+# dummy resource added for translation automation
+OptionPane.okButtonText=OK
 OptionPane.okButtonMnemonic=79
+# dummy resource added for translation automation
+OptionPane.cancelButtonText=Annulla
 OptionPane.cancelButtonMnemonic=65
 

--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties	Thu Apr 21 09:42:59 2011 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties	Mon Apr 25 16:39:49 2011 -0700
@@ -79,6 +79,10 @@
 FileChooser.renameFileErrorTitle=\u30A8\u30E9\u30FC
 FileChooser.renameFileErrorText=\u30D5\u30A1\u30A4\u30EB"{0}"\u306E"{1}"\u3078\u306E\u5909\u66F4\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
 
+# dummy resource added for translation automation
+OptionPane.okButtonText=OK(O)
 OptionPane.okButtonMnemonic=79
+# dummy resource added for translation automation
+OptionPane.cancelButtonText=\u53D6\u6D88(C)
 OptionPane.cancelButtonMnemonic=67
 

--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties	Thu Apr 21 09:42:59 2011 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties	Mon Apr 25 16:39:49 2011 -0700
@@ -79,6 +79,10 @@
 FileChooser.renameFileErrorTitle=\uC624\uB958
 FileChooser.renameFileErrorText="{0}" \uD30C\uC77C\uC758 \uC774\uB984\uC744 "{1}"(\uC73C)\uB85C \uBC14\uAFB8\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
 
+# dummy resource added for translation automation
+OptionPane.okButtonText=\uD655\uC778(O)
 OptionPane.okButtonMnemonic=79
+# dummy resource added for translation automation
+OptionPane.cancelButtonText=\uCDE8\uC18C(C)
 OptionPane.cancelButtonMnemonic=67
 

--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties	Thu Apr 21 09:42:59 2011 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties	Mon Apr 25 16:39:49 2011 -0700
@@ -79,6 +79,10 @@
 FileChooser.renameFileErrorTitle=Erro
 FileChooser.renameFileErrorText=Erro ao renomear o arquivo "{0}" por "{1}"
 
+# dummy resource added for translation automation
+OptionPane.okButtonText=OK
 OptionPane.okButtonMnemonic=79
+# dummy resource added for translation automation
+OptionPane.cancelButtonText=Cancelar
 OptionPane.cancelButtonMnemonic=67
 

--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties	Thu Apr 21 09:42:59 2011 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties	Mon Apr 25 16:39:49 2011 -0700
@@ -79,6 +79,10 @@
 FileChooser.renameFileErrorTitle=Fel
 FileChooser.renameFileErrorText=Fel vid namn\u00E4ndring av fil "{0}" till "{1}"
 
+# dummy resource added for translation automation
+OptionPane.okButtonText=OK
 OptionPane.okButtonMnemonic=79
+# dummy resource added for translation automation
+OptionPane.cancelButtonText=Avbryt
 OptionPane.cancelButtonMnemonic=65
 

--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties	Thu Apr 21 09:42:59 2011 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties	Mon Apr 25 16:39:49 2011 -0700
@@ -79,6 +79,10 @@
 FileChooser.renameFileErrorTitle=\u9519\u8BEF
 FileChooser.renameFileErrorText=\u5C06\u6587\u4EF6 "{0}" \u91CD\u547D\u540D\u4E3A "{1}" \u65F6\u51FA\u9519
 
+# dummy resource added for translation automation
+OptionPane.okButtonText=\u786E\u5B9A(O)
 OptionPane.okButtonMnemonic=79
+# dummy resource added for translation automation
+OptionPane.cancelButtonText=\u53D6\u6D88(C)
 OptionPane.cancelButtonMnemonic=67
 

--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties	Thu Apr 21 09:42:59 2011 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties	Mon Apr 25 16:39:49 2011 -0700
@@ -79,6 +79,10 @@
 FileChooser.renameFileErrorTitle=\u932F\u8AA4
 FileChooser.renameFileErrorText=\u5C07\u6A94\u6848 "{0}" \u91CD\u65B0\u547D\u540D\u70BA "{1}" \u6642\u51FA\u73FE\u932F\u8AA4
 
+# dummy resource added for translation automation
+OptionPane.okButtonText=\u78BA\u5B9A(O)
 OptionPane.okButtonMnemonic=79
+# dummy resource added for translation automation
+OptionPane.cancelButtonText=\u53D6\u6D88(C)
 OptionPane.cancelButtonMnemonic=67
 

--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties	Thu Apr 21 09:42:59 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties	Mon Apr 25 16:39:49 2011 -0700
@@ -59,9 +59,9 @@
 FileChooser.cancelButtonText=Cancel
 FileChooser.cancelButtonMnemonic=67
 FileChooser.saveButtonText=Save
-FileChooser.saveButtonMnemonic=83
+FileChooser.saveButtonMnemonic=83 // not needed?
 FileChooser.openButtonText=Open
-FileChooser.openButtonMnemonic=79
+FileChooser.openButtonMnemonic=79 //not needed?
 FileChooser.saveDialogTitleText=Save
 FileChooser.openDialogTitleText=Open
 FileChooser.updateButtonText=Update
@@ -121,11 +121,11 @@
 ColorChooser.rgbNameText=RGB
 ColorChooser.rgbMnemonic=71
 ColorChooser.rgbRedText=Red
-ColorChooser.rgbRedMnemonic=68
+ColorChooser.rgbRedMnemonic=68 // not needed?
 ColorChooser.rgbGreenText=Green
-ColorChooser.rgbGreenMnemonic=78
+ColorChooser.rgbGreenMnemonic=78 // not needed?
 ColorChooser.rgbBlueText=Blue
-ColorChooser.rgbBlueMnemonic=66
+ColorChooser.rgbBlueMnemonic=66 // not needed?
 ColorChooser.rgbAlphaText=Alpha
 ColorChooser.rgbHexCodeText=Color Code
 ColorChooser.rgbHexCodeMnemonic=67

--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties	Thu Apr 21 09:42:59 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties	Mon Apr 25 16:39:49 2011 -0700
@@ -144,10 +144,10 @@
 OptionPane.yesButtonMnemonic=74
 OptionPane.noButtonText=Nein
 OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK(0)
-OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=Abbrechen(0)
-OptionPane.cancelButtonMnemonic=0
+OptionPane.okButtonText=OK
+OptionPane.okButtonMnemonic=O
+OptionPane.cancelButtonText=Abbrechen
+OptionPane.cancelButtonMnemonic=A
 OptionPane.titleText=Option ausw\u00E4hlen
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.

--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties	Thu Apr 21 09:42:59 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties	Mon Apr 25 16:39:49 2011 -0700
@@ -144,10 +144,10 @@
 OptionPane.yesButtonMnemonic=83
 OptionPane.noButtonText=No
 OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK(0)
-OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=Cancelar (0)
-OptionPane.cancelButtonMnemonic=0
+OptionPane.okButtonText=OK
+OptionPane.okButtonMnemonic=O
+OptionPane.cancelButtonText=Cancelar
+OptionPane.cancelButtonMnemonic=C
 OptionPane.titleText=Seleccionar una Opci\u00F3n
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.

--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties	Thu Apr 21 09:42:59 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties	Mon Apr 25 16:39:49 2011 -0700
@@ -144,10 +144,10 @@
 OptionPane.yesButtonMnemonic=79
 OptionPane.noButtonText=Non
 OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK(0)
-OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=Annuler (0)
-OptionPane.cancelButtonMnemonic=0
+OptionPane.okButtonText=OK
+OptionPane.okButtonMnemonic=O
+OptionPane.cancelButtonText=Annuler
+OptionPane.cancelButtonMnemonic=A
 OptionPane.titleText=S\u00E9lectionner une option
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.

--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties	Thu Apr 21 09:42:59 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties	Mon Apr 25 16:39:49 2011 -0700
@@ -57,9 +57,9 @@
 FileChooser.acceptAllFileFilterText=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB
 FileChooser.cancelButtonText=\u53D6\u6D88(C)
 FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=\u4FDD\u5B58(S)
+FileChooser.saveButtonText=\u4FDD\u5B58
 FileChooser.saveButtonMnemonic=83
-FileChooser.openButtonText=\u958B\u304F(O)
+FileChooser.openButtonText=\u958B\u304F
 FileChooser.openButtonMnemonic=79
 FileChooser.saveDialogTitleText=\u4FDD\u5B58
 FileChooser.openDialogTitleText=\u958B\u304F
@@ -105,25 +105,25 @@
 # constant, and an index into the text to render the mnemonic as. The
 # mnemonic is xxxMnemonic and the index of the character to underline is
 # xxxDisplayedMnemonicIndex.
-ColorChooser.hsvNameText=HSV(H)
+ColorChooser.hsvNameText=HSV
 ColorChooser.hsvMnemonic=72
 ColorChooser.hsvHueText=\u8272\u76F8
 ColorChooser.hsvSaturationText=\u5F69\u5EA6
 ColorChooser.hsvValueText=\u5024
 ColorChooser.hsvTransparencyText=\u900F\u660E\u5EA6
-ColorChooser.hslNameText=HSL(L)
+ColorChooser.hslNameText=HSL
 ColorChooser.hslMnemonic=76
 ColorChooser.hslHueText=\u8272\u76F8
 ColorChooser.hslSaturationText=\u5F69\u5EA6
 ColorChooser.hslLightnessText=\u660E\u5EA6
 ColorChooser.hslTransparencyText=\u900F\u660E\u5EA6
-ColorChooser.rgbNameText=RGB(G)
+ColorChooser.rgbNameText=RGB
 ColorChooser.rgbMnemonic=71
-ColorChooser.rgbRedText=\u8D64(D)
+ColorChooser.rgbRedText=\u8D64
 ColorChooser.rgbRedMnemonic=68
-ColorChooser.rgbGreenText=\u7DD1(N)
+ColorChooser.rgbGreenText=\u7DD1
 ColorChooser.rgbGreenMnemonic=78
-ColorChooser.rgbBlueText=\u9752(B)
+ColorChooser.rgbBlueText=\u9752
 ColorChooser.rgbBlueMnemonic=66
 ColorChooser.rgbAlphaText=\u30A2\u30EB\u30D5\u30A1
 ColorChooser.rgbHexCodeText=\u8272\u30B3\u30FC\u30C9(C)
@@ -144,8 +144,8 @@
 OptionPane.yesButtonMnemonic=89
 OptionPane.noButtonText=\u3044\u3044\u3048(N)
 OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK(0)
-OptionPane.okButtonMnemonic=0
+OptionPane.okButtonText=OK
+OptionPane.okButtonMnemonic=O
 OptionPane.cancelButtonText=\u53D6\u6D88(0)
 OptionPane.cancelButtonMnemonic=0
 OptionPane.titleText=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u9078\u629E

--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties	Thu Apr 21 09:42:59 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties	Mon Apr 25 16:39:49 2011 -0700
@@ -57,9 +57,9 @@
 FileChooser.acceptAllFileFilterText=\uBAA8\uB4E0 \uD30C\uC77C
 FileChooser.cancelButtonText=\uCDE8\uC18C(C)
 FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=\uC800\uC7A5(S)
+FileChooser.saveButtonText=\uC800\uC7A5
 FileChooser.saveButtonMnemonic=83
-FileChooser.openButtonText=\uC5F4\uAE30(O)
+FileChooser.openButtonText=\uC5F4\uAE30
 FileChooser.openButtonMnemonic=79
 FileChooser.saveDialogTitleText=\uC800\uC7A5
 FileChooser.openDialogTitleText=\uC5F4\uAE30
@@ -105,25 +105,25 @@
 # constant, and an index into the text to render the mnemonic as. The
 # mnemonic is xxxMnemonic and the index of the character to underline is
 # xxxDisplayedMnemonicIndex.
-ColorChooser.hsvNameText=HSV(H)
+ColorChooser.hsvNameText=HSV
 ColorChooser.hsvMnemonic=72
 ColorChooser.hsvHueText=\uC0C9\uC870
 ColorChooser.hsvSaturationText=\uCC44\uB3C4
 ColorChooser.hsvValueText=\uAC12
 ColorChooser.hsvTransparencyText=\uD22C\uBA85
-ColorChooser.hslNameText=HSL(L)
+ColorChooser.hslNameText=HSL
 ColorChooser.hslMnemonic=76
 ColorChooser.hslHueText=\uC0C9\uC870
 ColorChooser.hslSaturationText=\uCC44\uB3C4
 ColorChooser.hslLightnessText=\uBC1D\uAE30
 ColorChooser.hslTransparencyText=\uD22C\uBA85
-ColorChooser.rgbNameText=RGB(G)
+ColorChooser.rgbNameText=RGB
 ColorChooser.rgbMnemonic=71
-ColorChooser.rgbRedText=\uBE68\uAC04\uC0C9(D)
+ColorChooser.rgbRedText=\uBE68\uAC04\uC0C9
 ColorChooser.rgbRedMnemonic=68
-ColorChooser.rgbGreenText=\uB179\uC0C9(N)
+ColorChooser.rgbGreenText=\uB179\uC0C9
 ColorChooser.rgbGreenMnemonic=78
-ColorChooser.rgbBlueText=\uD30C\uB780\uC0C9(B)
+ColorChooser.rgbBlueText=\uD30C\uB780\uC0C9
 ColorChooser.rgbBlueMnemonic=66
 ColorChooser.rgbAlphaText=\uC54C\uD30C
 ColorChooser.rgbHexCodeText=\uC0C9\uC0C1 \uCF54\uB4DC(C)
@@ -144,8 +144,8 @@
 OptionPane.yesButtonMnemonic=89
 OptionPane.noButtonText=\uC544\uB2C8\uC624(N)
 OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK(0)
-OptionPane.okButtonMnemonic=0
+OptionPane.okButtonText=OK
+OptionPane.okButtonMnemonic=O
 OptionPane.cancelButtonText=\uCDE8\uC18C(0)
 OptionPane.cancelButtonMnemonic=0
 OptionPane.titleText=\uC635\uC158 \uC120\uD0DD

--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties	Thu Apr 21 09:42:59 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties	Mon Apr 25 16:39:49 2011 -0700
@@ -144,10 +144,10 @@
 OptionPane.yesButtonMnemonic=83
 OptionPane.noButtonText=N\u00E3o
 OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK(0)
-OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=Cancelar(0)
-OptionPane.cancelButtonMnemonic=0
+OptionPane.okButtonText=OK
+OptionPane.okButtonMnemonic=O
+OptionPane.cancelButtonText=Cancelar
+OptionPane.cancelButtonMnemonic=C
 OptionPane.titleText=Selecionar uma Op\u00E7\u00E3o
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.

--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties	Thu Apr 21 09:42:59 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties	Mon Apr 25 16:39:49 2011 -0700
@@ -57,9 +57,9 @@
 FileChooser.acceptAllFileFilterText=\u6240\u6709\u6587\u4EF6
 FileChooser.cancelButtonText=\u53D6\u6D88(C)
 FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=\u4FDD\u5B58(S)
+FileChooser.saveButtonText=\u4FDD\u5B58
 FileChooser.saveButtonMnemonic=83
-FileChooser.openButtonText=\u6253\u5F00(O)
+FileChooser.openButtonText=\u6253\u5F00
 FileChooser.openButtonMnemonic=79
 FileChooser.saveDialogTitleText=\u4FDD\u5B58
 FileChooser.openDialogTitleText=\u6253\u5F00
@@ -105,25 +105,25 @@
 # constant, and an index into the text to render the mnemonic as. The
 # mnemonic is xxxMnemonic and the index of the character to underline is
 # xxxDisplayedMnemonicIndex.
-ColorChooser.hsvNameText=HSV(H)
+ColorChooser.hsvNameText=HSV
 ColorChooser.hsvMnemonic=72
 ColorChooser.hsvHueText=\u8272\u8C03
 ColorChooser.hsvSaturationText=\u9971\u548C\u5EA6
 ColorChooser.hsvValueText=\u503C
 ColorChooser.hsvTransparencyText=\u900F\u660E\u5EA6
-ColorChooser.hslNameText=HSL(L)
+ColorChooser.hslNameText=HSL
 ColorChooser.hslMnemonic=76
 ColorChooser.hslHueText=\u8272\u8C03
 ColorChooser.hslSaturationText=\u9971\u548C\u5EA6
 ColorChooser.hslLightnessText=\u4EAE\u5EA6
 ColorChooser.hslTransparencyText=\u900F\u660E\u5EA6
-ColorChooser.rgbNameText=RGB(G)
+ColorChooser.rgbNameText=RGB
 ColorChooser.rgbMnemonic=71
-ColorChooser.rgbRedText=\u7EA2\u8272(D)
+ColorChooser.rgbRedText=\u7EA2\u8272
 ColorChooser.rgbRedMnemonic=68
-ColorChooser.rgbGreenText=\u7EFF\u8272(N)
+ColorChooser.rgbGreenText=\u7EFF\u8272
 ColorChooser.rgbGreenMnemonic=78
-ColorChooser.rgbBlueText=\u84DD\u8272(B)
+ColorChooser.rgbBlueText=\u84DD\u8272
 ColorChooser.rgbBlueMnemonic=66
 ColorChooser.rgbAlphaText=Alpha
 ColorChooser.rgbHexCodeText=\u989C\u8272\u4EE3\u7801(C)
@@ -144,8 +144,8 @@
 OptionPane.yesButtonMnemonic=89
 OptionPane.noButtonText=\u5426(N)
 OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK(0)
-OptionPane.okButtonMnemonic=0
+OptionPane.okButtonText=OK
+OptionPane.okButtonMnemonic=O
 OptionPane.cancelButtonText=\u53D6\u6D88(0)
 OptionPane.cancelButtonMnemonic=0
 OptionPane.titleText=\u9009\u62E9\u4E00\u4E2A\u9009\u9879

--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties	Thu Apr 21 09:42:59 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties	Mon Apr 25 16:39:49 2011 -0700
@@ -57,9 +57,9 @@
 FileChooser.acceptAllFileFilterText=\u6240\u6709\u6A94\u6848
 FileChooser.cancelButtonText=\u53D6\u6D88(C)
 FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=\u5132\u5B58(S)
+FileChooser.saveButtonText=\u5132\u5B58
 FileChooser.saveButtonMnemonic=83
-FileChooser.openButtonText=\u958B\u555F(O)
+FileChooser.openButtonText=\u958B\u555F
 FileChooser.openButtonMnemonic=79
 FileChooser.saveDialogTitleText=\u5132\u5B58
 FileChooser.openDialogTitleText=\u958B\u555F
@@ -105,25 +105,25 @@
 # constant, and an index into the text to render the mnemonic as. The
 # mnemonic is xxxMnemonic and the index of the character to underline is
 # xxxDisplayedMnemonicIndex.
-ColorChooser.hsvNameText=HSV(H)
+ColorChooser.hsvNameText=HSV
 ColorChooser.hsvMnemonic=72
 ColorChooser.hsvHueText=\u8272\u8ABF
 ColorChooser.hsvSaturationText=\u5F69\u5EA6
 ColorChooser.hsvValueText=\u6578\u503C
 ColorChooser.hsvTransparencyText=\u900F\u660E\u5EA6
-ColorChooser.hslNameText=HSL(L)
+ColorChooser.hslNameText=HSL
 ColorChooser.hslMnemonic=76
 ColorChooser.hslHueText=\u8272\u8ABF
 ColorChooser.hslSaturationText=\u5F69\u5EA6
 ColorChooser.hslLightnessText=\u4EAE\u5EA6
 ColorChooser.hslTransparencyText=\u900F\u660E\u5EA6
-ColorChooser.rgbNameText=RGB(G)
+ColorChooser.rgbNameText=RGB
 ColorChooser.rgbMnemonic=71
-ColorChooser.rgbRedText=\u7D05(D)
+ColorChooser.rgbRedText=\u7D05
 ColorChooser.rgbRedMnemonic=68
-ColorChooser.rgbGreenText=\u7DA0(N)
+ColorChooser.rgbGreenText=\u7DA0
 ColorChooser.rgbGreenMnemonic=78
-ColorChooser.rgbBlueText=\u85CD(B)
+ColorChooser.rgbBlueText=\u85CD
 ColorChooser.rgbBlueMnemonic=66
 ColorChooser.rgbAlphaText=Alpha
 ColorChooser.rgbHexCodeText=\u984F\u8272\u4EE3\u78BC(C)
@@ -144,8 +144,8 @@
 OptionPane.yesButtonMnemonic=89
 OptionPane.noButtonText=\u5426(N)
 OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK(0)
-OptionPane.okButtonMnemonic=0
+OptionPane.okButtonText=OK
+OptionPane.okButtonMnemonic=O
 OptionPane.cancelButtonText=\u53D6\u6D88(0)
 OptionPane.cancelButtonMnemonic=0
 OptionPane.titleText=\u9078\u53D6\u4E00\u500B\u9078\u9805

--- a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_sv.java	Thu Apr 21 09:42:59 2011 -0700
+++ b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_sv.java	Mon Apr 25 16:39:49 2011 -0700
@@ -73,7 +73,7 @@
             {"appletviewer.parse.warning.embed.requiresheight", "Varning: <embed>-taggen kr\u00E4ver ett h\u00F6jdattribut."},
             {"appletviewer.parse.warning.embed.requireswidth", "Varning: <embed>-taggen kr\u00E4ver ett breddattribut."},
             {"appletviewer.parse.warning.appnotLongersupported", "Varning: <app>-taggen st\u00F6ds inte l\u00E4ngre, anv\u00E4nd <applet> ist\u00E4llet:"},
-            {"appletviewer.usage", "Syntax: appletviewer <alternativ> url:er \n\nd\u00E4r <alternativ> inkluderar:\n  -debug                  Startar appletvisning i Java-fels\u00F6kningen\n  -encoding <kodning>    Anger teckenkodning  som anv\u00E4nds i HTML-filer\n  -J<k\u00F6rningsflagga>        \u00D6verf\u00F6r argument till Java-tolkningen\n\nAlternativet -J \u00E4r inte standard och kan \u00E4ndras utan f\u00F6reg\u00E5ende meddelande."},
+            {"appletviewer.usage", "Syntax: appletviewer-<alternativ> url:er \n\nd\u00E4r <alternativ> inkluderar:\n  -debug                  Startar appletvisning i Java-fels\u00F6kningen\n  -encoding <kodning>    Anger teckenkodning  som anv\u00E4nds i HTML-filer\n  -J<k\u00F6rningsflagga>        \u00D6verf\u00F6r argument till Java-tolkningen\n\nAlternativet -J \u00E4r inte standard och kan \u00E4ndras utan f\u00F6reg\u00E5ende meddelande."},
             {"appletviewer.main.err.unsupportedopt", "Alternativ som inte st\u00F6ds: {0}"},
             {"appletviewer.main.err.unrecognizedarg", "Ok\u00E4nt argument: {0}"},
             {"appletviewer.main.err.dupoption", "Duplicerat alternativ: {0}"},
@@ -152,7 +152,7 @@
             {"appletprops.label.unsignedapplet", "Till\u00E5t osignerade appletar:"},
             {"appletprops.choice.unsignedapplet.no", "Nej"},
             {"appletprops.choice.unsignedapplet.yes", "Ja"},
-            {"appletprops.button.apply", "Till\u00E4mpa"},
+            {"appletprops.button.apply", "Anv\u00E4nd"},
             {"appletprops.button.cancel", "Avbryt"},
             {"appletprops.button.reset", "\u00C5terst\u00E4ll"},
             {"appletprops.apply.exception", "Kunde inte spara egenskaper: {0}"},