1.1 --- a/make/common/Defs-linux.gmk Tue May 03 15:02:55 2011 -0700
1.2 +++ b/make/common/Defs-linux.gmk Wed May 04 09:25:05 2011 -0700
1.3 @@ -354,7 +354,7 @@
1.4 # Japanese manpages
1.5 #
1.6 JA_SOURCE_ENCODING = eucJP
1.7 -JA_TARGET_ENCODINGS = eucJP
1.8 +JA_TARGET_ENCODINGS = UTF-8
1.9
1.10 # Settings for the JDI - Serviceability Agent binding.
1.11 HOTSPOT_SALIB_PATH = $(HOTSPOT_IMPORT_PATH)/jre/lib/$(LIBARCH)
2.1 --- a/make/common/Release.gmk Tue May 03 15:02:55 2011 -0700
2.2 +++ b/make/common/Release.gmk Wed May 04 09:25:05 2011 -0700
2.3 @@ -164,7 +164,7 @@
2.4 ifeq ($(PLATFORM), linux)
2.5 MANBASEDIRS=$(JDK_TOPDIR)/src/linux/doc $(IMPORTDOCDIR)
2.6 MAN1SUBDIR=man
2.7 - JA_DIRNAME=ja_JP.$(JA_SOURCE_ENCODING)
2.8 + JA_DIRNAME=ja_JP.UTF-8
2.9 endif # linux
2.10
2.11 define copy-man-pages
2.12 @@ -190,8 +190,7 @@
2.13 done
2.14 $(java-vm-cleanup)
2.15 if [ "$(JA_DIRNAME)" != "" ] ; then \
2.16 - $(MV) $1/man/ja $1/man/$(JA_DIRNAME); \
2.17 - $(CD) $1/man && $(LN) -s $(JA_DIRNAME) ja; \
2.18 + $(CD) $1/man && $(RM) ja && $(LN) -s $(JA_DIRNAME) ja; \
2.19 fi
2.20 endef
2.21
3.1 --- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties Tue May 03 15:02:55 2011 -0700
3.2 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties Wed May 04 09:25:05 2011 -0700
3.3 @@ -56,9 +56,9 @@
3.4 FileChooser.renameFileButtonText=Rename File
3.5 FileChooser.renameFileButtonMnemonic=82
3.6 FileChooser.cancelButtonText=Cancel
3.7 -FileChooser.cancelButtonMnemonic=67
3.8 +#FileChooser.cancelButtonMnemonic=67
3.9 FileChooser.saveButtonText=OK
3.10 -FileChooser.saveButtonMnemonic=79
3.11 +#FileChooser.saveButtonMnemonic=79
3.12 FileChooser.openButtonText=OK
3.13 FileChooser.openButtonMnemonic=79
3.14 FileChooser.saveDialogTitleText=Save
3.15 @@ -79,9 +79,5 @@
3.16 FileChooser.renameFileErrorTitle=Error
3.17 FileChooser.renameFileErrorText=Error renaming file "{0}" to "{1}"
3.18
3.19 -# dummy resource added for translation automation
3.20 -OptionPane.okButtonText=OK
3.21 -OptionPane.okButtonMnemonic=79
3.22 -# dummy resource added for translation automation
3.23 -OptionPane.cancelButtonText=Cancel
3.24 -OptionPane.cancelButtonMnemonic=67
3.25 +#OptionPane.okButtonMnemonic=79
3.26 +#OptionPane.cancelButtonMnemonic=67
4.1 --- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties Tue May 03 15:02:55 2011 -0700
4.2 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties Wed May 04 09:25:05 2011 -0700
4.3 @@ -24,7 +24,7 @@
4.4 GTKColorChooserPanel.hueMnemonic=70
4.5
4.6 GTKColorChooserPanel.redText=Rot:
4.7 -GTKColorChooserPanel.redMnemonic=79
4.8 +GTKColorChooserPanel.redMnemonic=82
4.9
4.10 GTKColorChooserPanel.saturationText=S\u00E4ttigung:
4.11 GTKColorChooserPanel.saturationMnemonic=83
5.1 --- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties Tue May 03 15:02:55 2011 -0700
5.2 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties Wed May 04 09:25:05 2011 -0700
5.3 @@ -30,7 +30,7 @@
5.4 GTKColorChooserPanel.saturationMnemonic=83
5.5
5.6 GTKColorChooserPanel.greenText=Verde:
5.7 -GTKColorChooserPanel.greenMnemonic=86
5.8 +GTKColorChooserPanel.greenMnemonic=69
5.9
5.10 GTKColorChooserPanel.valueText=Valor:
5.11 GTKColorChooserPanel.valueMnemonic=86
6.1 --- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties Tue May 03 15:02:55 2011 -0700
6.2 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties Wed May 04 09:25:05 2011 -0700
6.3 @@ -30,7 +30,7 @@
6.4 GTKColorChooserPanel.saturationMnemonic=83
6.5
6.6 GTKColorChooserPanel.greenText=Vert :
6.7 -GTKColorChooserPanel.greenMnemonic=86
6.8 +GTKColorChooserPanel.greenMnemonic=69
6.9
6.10 GTKColorChooserPanel.valueText=Valeur :
6.11 GTKColorChooserPanel.valueMnemonic=86
7.1 --- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties Tue May 03 15:02:55 2011 -0700
7.2 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties Wed May 04 09:25:05 2011 -0700
7.3 @@ -30,7 +30,7 @@
7.4 GTKColorChooserPanel.saturationMnemonic=83
7.5
7.6 GTKColorChooserPanel.greenText=Verde:
7.7 -GTKColorChooserPanel.greenMnemonic=86
7.8 +GTKColorChooserPanel.greenMnemonic=69
7.9
7.10 GTKColorChooserPanel.valueText=Valore:
7.11 GTKColorChooserPanel.valueMnemonic=86
8.1 --- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties Tue May 03 15:02:55 2011 -0700
8.2 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties Wed May 04 09:25:05 2011 -0700
8.3 @@ -55,11 +55,11 @@
8.4 FileChooser.deleteFileButtonMnemonic=76
8.5 FileChooser.renameFileButtonText=\u30D5\u30A1\u30A4\u30EB\u306E\u540D\u524D\u5909\u66F4(R)
8.6 FileChooser.renameFileButtonMnemonic=82
8.7 -FileChooser.cancelButtonText=\u53D6\u6D88(C)
8.8 +FileChooser.cancelButtonText=\u53D6\u6D88
8.9 FileChooser.cancelButtonMnemonic=67
8.10 -FileChooser.saveButtonText=OK(O)
8.11 +FileChooser.saveButtonText=OK
8.12 FileChooser.saveButtonMnemonic=79
8.13 -FileChooser.openButtonText=OK(O)
8.14 +FileChooser.openButtonText=OK
8.15 FileChooser.openButtonMnemonic=79
8.16 FileChooser.saveDialogTitleText=\u4FDD\u5B58
8.17 FileChooser.openDialogTitleText=\u958B\u304F
8.18 @@ -79,10 +79,6 @@
8.19 FileChooser.renameFileErrorTitle=\u30A8\u30E9\u30FC
8.20 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
8.21
8.22 -# dummy resource added for translation automation
8.23 -OptionPane.okButtonText=OK(O)
8.24 -OptionPane.okButtonMnemonic=79
8.25 -# dummy resource added for translation automation
8.26 -OptionPane.cancelButtonText=\u53D6\u6D88(C)
8.27 -OptionPane.cancelButtonMnemonic=67
8.28 +#OptionPane.okButtonMnemonic=79
8.29 +#OptionPane.cancelButtonMnemonic=67
8.30
9.1 --- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties Tue May 03 15:02:55 2011 -0700
9.2 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties Wed May 04 09:25:05 2011 -0700
9.3 @@ -55,11 +55,11 @@
9.4 FileChooser.deleteFileButtonMnemonic=76
9.5 FileChooser.renameFileButtonText=\uD30C\uC77C \uC774\uB984 \uBC14\uAFB8\uAE30(R)
9.6 FileChooser.renameFileButtonMnemonic=82
9.7 -FileChooser.cancelButtonText=\uCDE8\uC18C(C)
9.8 +FileChooser.cancelButtonText=\uCDE8\uC18C
9.9 FileChooser.cancelButtonMnemonic=67
9.10 -FileChooser.saveButtonText=\uD655\uC778(O)
9.11 +FileChooser.saveButtonText=\uD655\uC778
9.12 FileChooser.saveButtonMnemonic=79
9.13 -FileChooser.openButtonText=\uD655\uC778(O)
9.14 +FileChooser.openButtonText=\uD655\uC778
9.15 FileChooser.openButtonMnemonic=79
9.16 FileChooser.saveDialogTitleText=\uC800\uC7A5
9.17 FileChooser.openDialogTitleText=\uC5F4\uAE30
9.18 @@ -79,10 +79,6 @@
9.19 FileChooser.renameFileErrorTitle=\uC624\uB958
9.20 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.
9.21
9.22 -# dummy resource added for translation automation
9.23 -OptionPane.okButtonText=\uD655\uC778(O)
9.24 -OptionPane.okButtonMnemonic=79
9.25 -# dummy resource added for translation automation
9.26 -OptionPane.cancelButtonText=\uCDE8\uC18C(C)
9.27 -OptionPane.cancelButtonMnemonic=67
9.28 +#OptionPane.okButtonMnemonic=79
9.29 +#OptionPane.cancelButtonMnemonic=67
9.30
10.1 --- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties Tue May 03 15:02:55 2011 -0700
10.2 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties Wed May 04 09:25:05 2011 -0700
10.3 @@ -30,7 +30,7 @@
10.4 GTKColorChooserPanel.saturationMnemonic=83
10.5
10.6 GTKColorChooserPanel.greenText=Verde:
10.7 -GTKColorChooserPanel.greenMnemonic=86
10.8 +GTKColorChooserPanel.greenMnemonic=68
10.9
10.10 GTKColorChooserPanel.valueText=Valor:
10.11 GTKColorChooserPanel.valueMnemonic=86
11.1 --- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties Tue May 03 15:02:55 2011 -0700
11.2 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties Wed May 04 09:25:05 2011 -0700
11.3 @@ -39,7 +39,7 @@
11.4 GTKColorChooserPanel.blueMnemonic=66
11.5
11.6 GTKColorChooserPanel.colorNameText=F\u00E4rgnamn:
11.7 -GTKColorChooserPanel.colorNameMnemonic=78
11.8 +GTKColorChooserPanel.colorNameMnemonic=70
11.9
11.10
11.11
12.1 --- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties Tue May 03 15:02:55 2011 -0700
12.2 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties Wed May 04 09:25:05 2011 -0700
12.3 @@ -55,11 +55,11 @@
12.4 FileChooser.deleteFileButtonMnemonic=76
12.5 FileChooser.renameFileButtonText=\u91CD\u547D\u540D\u6587\u4EF6(R)
12.6 FileChooser.renameFileButtonMnemonic=82
12.7 -FileChooser.cancelButtonText=\u53D6\u6D88(C)
12.8 +FileChooser.cancelButtonText=\u53D6\u6D88
12.9 FileChooser.cancelButtonMnemonic=67
12.10 -FileChooser.saveButtonText=\u786E\u5B9A(O)
12.11 +FileChooser.saveButtonText=\u786E\u5B9A
12.12 FileChooser.saveButtonMnemonic=79
12.13 -FileChooser.openButtonText=\u786E\u5B9A(O)
12.14 +FileChooser.openButtonText=\u786E\u5B9A
12.15 FileChooser.openButtonMnemonic=79
12.16 FileChooser.saveDialogTitleText=\u4FDD\u5B58
12.17 FileChooser.openDialogTitleText=\u6253\u5F00
12.18 @@ -79,10 +79,6 @@
12.19 FileChooser.renameFileErrorTitle=\u9519\u8BEF
12.20 FileChooser.renameFileErrorText=\u5C06\u6587\u4EF6 "{0}" \u91CD\u547D\u540D\u4E3A "{1}" \u65F6\u51FA\u9519
12.21
12.22 -# dummy resource added for translation automation
12.23 -OptionPane.okButtonText=\u786E\u5B9A(O)
12.24 -OptionPane.okButtonMnemonic=79
12.25 -# dummy resource added for translation automation
12.26 -OptionPane.cancelButtonText=\u53D6\u6D88(C)
12.27 -OptionPane.cancelButtonMnemonic=67
12.28 +#OptionPane.okButtonMnemonic=79
12.29 +#OptionPane.cancelButtonMnemonic=67
12.30
13.1 --- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties Tue May 03 15:02:55 2011 -0700
13.2 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties Wed May 04 09:25:05 2011 -0700
13.3 @@ -55,11 +55,11 @@
13.4 FileChooser.deleteFileButtonMnemonic=76
13.5 FileChooser.renameFileButtonText=\u91CD\u65B0\u547D\u540D\u6A94\u6848(R)
13.6 FileChooser.renameFileButtonMnemonic=82
13.7 -FileChooser.cancelButtonText=\u53D6\u6D88(C)
13.8 +FileChooser.cancelButtonText=\u53D6\u6D88
13.9 FileChooser.cancelButtonMnemonic=67
13.10 -FileChooser.saveButtonText=\u78BA\u5B9A(O)
13.11 +FileChooser.saveButtonText=\u78BA\u5B9A
13.12 FileChooser.saveButtonMnemonic=79
13.13 -FileChooser.openButtonText=\u78BA\u5B9A(O)
13.14 +FileChooser.openButtonText=\u78BA\u5B9A
13.15 FileChooser.openButtonMnemonic=79
13.16 FileChooser.saveDialogTitleText=\u5132\u5B58
13.17 FileChooser.openDialogTitleText=\u958B\u555F
13.18 @@ -79,10 +79,6 @@
13.19 FileChooser.renameFileErrorTitle=\u932F\u8AA4
13.20 FileChooser.renameFileErrorText=\u5C07\u6A94\u6848 "{0}" \u91CD\u65B0\u547D\u540D\u70BA "{1}" \u6642\u51FA\u73FE\u932F\u8AA4
13.21
13.22 -# dummy resource added for translation automation
13.23 -OptionPane.okButtonText=\u78BA\u5B9A(O)
13.24 -OptionPane.okButtonMnemonic=79
13.25 -# dummy resource added for translation automation
13.26 -OptionPane.cancelButtonText=\u53D6\u6D88(C)
13.27 -OptionPane.cancelButtonMnemonic=67
13.28 +#OptionPane.okButtonMnemonic=79
13.29 +#OptionPane.cancelButtonMnemonic=67
13.30
14.1 --- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties Tue May 03 15:02:55 2011 -0700
14.2 +++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties Wed May 04 09:25:05 2011 -0700
14.3 @@ -57,7 +57,7 @@
14.4 Specify a different file name.
14.5 FileChooser.acceptAllFileFilterText=All Files
14.6 FileChooser.cancelButtonText=Cancel
14.7 -FileChooser.cancelButtonMnemonic=67
14.8 +#FileChooser.cancelButtonMnemonic=67 // not needed?
14.9 FileChooser.saveButtonText=Save
14.10 FileChooser.saveButtonMnemonic=83 // not needed?
14.11 FileChooser.openButtonText=Open
14.12 @@ -146,9 +146,9 @@
14.13 OptionPane.noButtonText=No
14.14 OptionPane.noButtonMnemonic=78
14.15 OptionPane.okButtonText=OK
14.16 -OptionPane.okButtonMnemonic=0
14.17 +#OptionPane.okButtonMnemonic=0
14.18 OptionPane.cancelButtonText=Cancel
14.19 -OptionPane.cancelButtonMnemonic=0
14.20 +#OptionPane.cancelButtonMnemonic=0
14.21 OptionPane.titleText=Select an Option
14.22 # Title for the dialog for the showInputDialog methods. Only used if
14.23 # the developer uses one of the variants that doesn't take a title.
15.1 --- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties Tue May 03 15:02:55 2011 -0700
15.2 +++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties Wed May 04 09:25:05 2011 -0700
15.3 @@ -55,7 +55,7 @@
15.4 FileChooser.renameErrorText={0}\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093
15.5 FileChooser.renameErrorFileExistsText={0}\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093: \u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059\u3002\u5225\u306E\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
15.6 FileChooser.acceptAllFileFilterText=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB
15.7 -FileChooser.cancelButtonText=\u53D6\u6D88(C)
15.8 +FileChooser.cancelButtonText=\u53D6\u6D88
15.9 FileChooser.cancelButtonMnemonic=67
15.10 FileChooser.saveButtonText=\u4FDD\u5B58
15.11 FileChooser.saveButtonMnemonic=83
15.12 @@ -146,7 +146,7 @@
15.13 OptionPane.noButtonMnemonic=78
15.14 OptionPane.okButtonText=OK
15.15 OptionPane.okButtonMnemonic=O
15.16 -OptionPane.cancelButtonText=\u53D6\u6D88(0)
15.17 +OptionPane.cancelButtonText=\u53D6\u6D88
15.18 OptionPane.cancelButtonMnemonic=0
15.19 OptionPane.titleText=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u9078\u629E
15.20 # Title for the dialog for the showInputDialog methods. Only used if
16.1 --- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties Tue May 03 15:02:55 2011 -0700
16.2 +++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties Wed May 04 09:25:05 2011 -0700
16.3 @@ -55,7 +55,7 @@
16.4 FileChooser.renameErrorText={0}\uC758 \uC774\uB984\uC744 \uBC14\uAFC0 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
16.5 FileChooser.renameErrorFileExistsText={0}\uC758 \uC774\uB984\uC744 \uBC14\uAFC0 \uC218 \uC5C6\uC74C: \uC9C0\uC815\uD55C \uC774\uB984\uC744 \uC0AC\uC6A9\uD558\uB294 \uD30C\uC77C\uC774 \uC874\uC7AC\uD569\uB2C8\uB2E4. \uB2E4\uB978 \uD30C\uC77C \uC774\uB984\uC744 \uC9C0\uC815\uD558\uC2ED\uC2DC\uC624.
16.6 FileChooser.acceptAllFileFilterText=\uBAA8\uB4E0 \uD30C\uC77C
16.7 -FileChooser.cancelButtonText=\uCDE8\uC18C(C)
16.8 +FileChooser.cancelButtonText=\uCDE8\uC18C
16.9 FileChooser.cancelButtonMnemonic=67
16.10 FileChooser.saveButtonText=\uC800\uC7A5
16.11 FileChooser.saveButtonMnemonic=83
16.12 @@ -146,7 +146,7 @@
16.13 OptionPane.noButtonMnemonic=78
16.14 OptionPane.okButtonText=OK
16.15 OptionPane.okButtonMnemonic=O
16.16 -OptionPane.cancelButtonText=\uCDE8\uC18C(0)
16.17 +OptionPane.cancelButtonText=\uCDE8\uC18C
16.18 OptionPane.cancelButtonMnemonic=0
16.19 OptionPane.titleText=\uC635\uC158 \uC120\uD0DD
16.20 # Title for the dialog for the showInputDialog methods. Only used if
17.1 --- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties Tue May 03 15:02:55 2011 -0700
17.2 +++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties Wed May 04 09:25:05 2011 -0700
17.3 @@ -96,7 +96,7 @@
17.4 ColorChooser.cancelText=Avbryt
17.5 ColorChooser.resetText=\u00C5terst\u00E4ll
17.6 # VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
17.7 -ColorChooser.resetMnemonic=82
17.8 +ColorChooser.resetMnemonic=84
17.9 ColorChooser.sampleText=Exempeltext Exempeltext
17.10 ColorChooser.swatchesNameText=Prov
17.11 ColorChooser.swatchesMnemonic=80
18.1 --- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties Tue May 03 15:02:55 2011 -0700
18.2 +++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties Wed May 04 09:25:05 2011 -0700
18.3 @@ -55,7 +55,7 @@
18.4 FileChooser.renameErrorText=\u65E0\u6CD5\u91CD\u547D\u540D{0}
18.5 FileChooser.renameErrorFileExistsText=\u65E0\u6CD5\u91CD\u547D\u540D{0}: \u5DF2\u5B58\u5728\u5177\u6709\u6240\u6307\u5B9A\u540D\u79F0\u7684\u6587\u4EF6\u3002\u8BF7\u6307\u5B9A\u5176\u4ED6\u6587\u4EF6\u540D\u3002
18.6 FileChooser.acceptAllFileFilterText=\u6240\u6709\u6587\u4EF6
18.7 -FileChooser.cancelButtonText=\u53D6\u6D88(C)
18.8 +FileChooser.cancelButtonText=\u53D6\u6D88
18.9 FileChooser.cancelButtonMnemonic=67
18.10 FileChooser.saveButtonText=\u4FDD\u5B58
18.11 FileChooser.saveButtonMnemonic=83
18.12 @@ -146,7 +146,7 @@
18.13 OptionPane.noButtonMnemonic=78
18.14 OptionPane.okButtonText=OK
18.15 OptionPane.okButtonMnemonic=O
18.16 -OptionPane.cancelButtonText=\u53D6\u6D88(0)
18.17 +OptionPane.cancelButtonText=\u53D6\u6D88
18.18 OptionPane.cancelButtonMnemonic=0
18.19 OptionPane.titleText=\u9009\u62E9\u4E00\u4E2A\u9009\u9879
18.20 # Title for the dialog for the showInputDialog methods. Only used if
19.1 --- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties Tue May 03 15:02:55 2011 -0700
19.2 +++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties Wed May 04 09:25:05 2011 -0700
19.3 @@ -55,7 +55,7 @@
19.4 FileChooser.renameErrorText=\u7121\u6CD5\u91CD\u65B0\u547D\u540D {0}
19.5 FileChooser.renameErrorFileExistsText=\u7121\u6CD5\u91CD\u65B0\u547D\u540D {0}: \u5DF2\u7D93\u5B58\u5728\u60A8\u6240\u6307\u5B9A\u540D\u7A31\u7684\u6A94\u6848\u3002\u8ACB\u6307\u5B9A\u4E0D\u540C\u7684\u540D\u7A31\u3002
19.6 FileChooser.acceptAllFileFilterText=\u6240\u6709\u6A94\u6848
19.7 -FileChooser.cancelButtonText=\u53D6\u6D88(C)
19.8 +FileChooser.cancelButtonText=\u53D6\u6D88
19.9 FileChooser.cancelButtonMnemonic=67
19.10 FileChooser.saveButtonText=\u5132\u5B58
19.11 FileChooser.saveButtonMnemonic=83
19.12 @@ -146,7 +146,7 @@
19.13 OptionPane.noButtonMnemonic=78
19.14 OptionPane.okButtonText=OK
19.15 OptionPane.okButtonMnemonic=O
19.16 -OptionPane.cancelButtonText=\u53D6\u6D88(0)
19.17 +OptionPane.cancelButtonText=\u53D6\u6D88
19.18 OptionPane.cancelButtonMnemonic=0
19.19 OptionPane.titleText=\u9078\u53D6\u4E00\u500B\u9078\u9805
19.20 # Title for the dialog for the showInputDialog methods. Only used if
20.1 --- a/src/share/classes/sun/print/resources/serviceui_fr.properties Tue May 03 15:02:55 2011 -0700
20.2 +++ b/src/share/classes/sun/print/resources/serviceui_fr.properties Wed May 04 09:25:05 2011 -0700
20.3 @@ -49,7 +49,7 @@
20.4 label.source.mnemonic=C
20.5 label.status=Statut :
20.6 label.username=Nom utilisateur :
20.7 -label.username.mnemonic=U
20.8 +label.username.mnemonic=O
20.9 label.millimetres=(mm)
20.10 label.inches=(po)
20.11 label.topmargin=haut
20.12 @@ -62,7 +62,7 @@
20.13 label.rightmargin.mnemonic=D
20.14 #
20.15 radiobutton.color=Couleur
20.16 -radiobutton.color.mnemonic=U
20.17 +radiobutton.color.mnemonic=C
20.18 radiobutton.draftq=Brouillon
20.19 radiobutton.draftq.mnemonic=L
20.20 radiobutton.duplex=Duplex
20.21 @@ -70,7 +70,7 @@
20.22 radiobutton.highq=Max.
20.23 radiobutton.highq.mnemonic=X
20.24 radiobutton.landscape=Paysage
20.25 -radiobutton.landscape.mnemonic=S
20.26 +radiobutton.landscape.mnemonic=Y
20.27 radiobutton.monochrome=Monochrome
20.28 radiobutton.monochrome.mnemonic=M
20.29 radiobutton.normalq=Normal
21.1 --- a/src/share/classes/sun/print/resources/serviceui_pt_BR.properties Tue May 03 15:02:55 2011 -0700
21.2 +++ b/src/share/classes/sun/print/resources/serviceui_pt_BR.properties Wed May 04 09:25:05 2011 -0700
21.3 @@ -15,10 +15,10 @@
21.4 button.ok=OK
21.5 button.print=Imprimir
21.6 button.properties=Propriedades...
21.7 -button.properties.mnemonic=R
21.8 +button.properties.mnemonic=D
21.9 #
21.10 checkbox.collate=Agrupar
21.11 -checkbox.collate.mnemonic=A
21.12 +checkbox.collate.mnemonic=R
21.13 checkbox.jobsheets=P\u00E1gina com Banner
21.14 checkbox.jobsheets.mnemonic=B
21.15 checkbox.printtofile=Imprimir em Arquivo
21.16 @@ -38,7 +38,7 @@
21.17 label.numcopies=N\u00FAmero de c\u00F3pias:
21.18 label.numcopies.mnemonic=O
21.19 label.priority=Prioridade:
21.20 -label.priority.mnemonic=R
21.21 +label.priority.mnemonic=P
21.22 label.psname=Nome:
21.23 label.psname.mnemonic=N
21.24 label.pstype=Tipo:
21.25 @@ -59,7 +59,7 @@
21.26 label.leftmargin=esquerda:
21.27 label.leftmargin.mnemonic=Q
21.28 label.rightmargin=direita
21.29 -label.rightmargin.mnemonic=R
21.30 +label.rightmargin.mnemonic=D
21.31 #
21.32 radiobutton.color=Cor
21.33 radiobutton.color.mnemonic=O
21.34 @@ -68,7 +68,7 @@
21.35 radiobutton.duplex=Duplex
21.36 radiobutton.duplex.mnemonic=D
21.37 radiobutton.highq=Alta
21.38 -radiobutton.highq.mnemonic=A
21.39 +radiobutton.highq.mnemonic=T
21.40 radiobutton.landscape=Paisagem
21.41 radiobutton.landscape.mnemonic=P
21.42 radiobutton.monochrome=Monocrom\u00E1tico
21.43 @@ -76,7 +76,7 @@
21.44 radiobutton.normalq=Normal
21.45 radiobutton.normalq.mnemonic=N
21.46 radiobutton.oneside=Um Lado
21.47 -radiobutton.oneside.mnemonic=O
21.48 +radiobutton.oneside.mnemonic=L
21.49 radiobutton.portrait=Retrato
21.50 radiobutton.portrait.mnemonic=R
21.51 radiobutton.rangeall=Tudo
21.52 @@ -86,7 +86,7 @@
21.53 radiobutton.revlandscape=Paisagem Invertida
21.54 radiobutton.revlandscape.mnemonic=N
21.55 radiobutton.revportrait=Retrato Invertido
21.56 -radiobutton.revportrait.mnemonic=I
21.57 +radiobutton.revportrait.mnemonic=E
21.58 radiobutton.tumble=Virar
21.59 radiobutton.tumble.mnemonic=V
21.60 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
21.61 @@ -96,7 +96,7 @@
21.62 tab.general=Geral
21.63 tab.general.vkMnemonic=71
21.64 tab.pagesetup=Configura\u00E7\u00E3o de P\u00E1gina
21.65 -tab.pagesetup.vkMnemonic=80
21.66 +tab.pagesetup.vkMnemonic=67
21.67 #
21.68 error.pagerange=Faixa de p\u00E1ginas inv\u00E1lida; insira novamente os valores (por exemplo, 1-3,5,7-10)
21.69 error.destination=Nome de arquivo inv\u00E1lido; tente novamente