Mercurial > hg > openjdk > jdk7 > jdk
changeset 4210:dfe56edc1a1d
Merge
author | alanb |
---|---|
date | Mon, 09 May 2011 01:57:28 -0700 |
parents | d93f6b6b986b (current diff) ce34293145b1 (diff) |
children | 31fbed875a6b |
files | |
diffstat | 27 files changed, 66 insertions(+), 112 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon May 09 01:47:05 2011 -0700 +++ b/.hgtags Mon May 09 01:57:28 2011 -0700 @@ -115,3 +115,4 @@ 60d3d55dcc9c31a30ced9caa6ef5c0dcd7db031d jdk7-b138 d80954a89b49fda47c0c5cace65a17f5a758b8bd jdk7-b139 9315c733fb17ddfb9fb44be7e0ffea37bf3c727d jdk7-b140 +63eeefe118da18c75ba3d36266768cd1ccaaca6b jdk7-b141
--- a/make/common/Defs-linux.gmk Mon May 09 01:47:05 2011 -0700 +++ b/make/common/Defs-linux.gmk Mon May 09 01:57:28 2011 -0700 @@ -354,7 +354,7 @@ # Japanese manpages # JA_SOURCE_ENCODING = eucJP -JA_TARGET_ENCODINGS = eucJP +JA_TARGET_ENCODINGS = UTF-8 # Settings for the JDI - Serviceability Agent binding. HOTSPOT_SALIB_PATH = $(HOTSPOT_IMPORT_PATH)/jre/lib/$(LIBARCH)
--- a/make/common/Program.gmk Mon May 09 01:47:05 2011 -0700 +++ b/make/common/Program.gmk Mon May 09 01:57:28 2011 -0700 @@ -55,10 +55,13 @@ program: $(ACTUAL_PROGRAM) -# reuse the mapfiles in the launcher's directory, the same should -# be applicable to the tool launchers as well. -FILES_m = $(BUILDDIR)/java/main/java/mapfile-$(ARCH) -include $(BUILDDIR)/common/Mapfile-vers.gmk +# Work-around for missing processor specific mapfiles +ifndef CROSS_COMPILE_ARCH + # reuse the mapfiles in the launcher's directory, the same should + # be applicable to the tool launchers as well. + FILES_m = $(BUILDDIR)/java/main/java/mapfile-$(ARCH) + include $(BUILDDIR)/common/Mapfile-vers.gmk +endif include $(JDK_TOPDIR)/make/common/Rules.gmk
--- a/make/common/Release.gmk Mon May 09 01:47:05 2011 -0700 +++ b/make/common/Release.gmk Mon May 09 01:57:28 2011 -0700 @@ -164,7 +164,7 @@ ifeq ($(PLATFORM), linux) MANBASEDIRS=$(JDK_TOPDIR)/src/linux/doc $(IMPORTDOCDIR) MAN1SUBDIR=man - JA_DIRNAME=ja_JP.$(JA_SOURCE_ENCODING) + JA_DIRNAME=ja_JP.UTF-8 endif # linux define copy-man-pages @@ -190,8 +190,7 @@ done $(java-vm-cleanup) if [ "$(JA_DIRNAME)" != "" ] ; then \ - $(MV) $1/man/ja $1/man/$(JA_DIRNAME); \ - $(CD) $1/man && $(LN) -s $(JA_DIRNAME) ja; \ + $(CD) $1/man && $(RM) ja && $(LN) -s $(JA_DIRNAME) ja; \ fi endef
--- a/make/common/shared/Defs-utils.gmk Mon May 09 01:47:05 2011 -0700 +++ b/make/common/shared/Defs-utils.gmk Mon May 09 01:57:28 2011 -0700 @@ -109,6 +109,8 @@ GDB = $(UTILS_USR_BIN_PATH)gdb GREP = $(UTILS_COMMAND_PATH)grep GUNZIP = $(UTILS_COMMAND_PATH)gunzip +# GZIP is used for solaris. Linux and windows use tar czf +GZIP = $(UTILS_COMMAND_PATH)gzip HEAD = $(UTILS_USR_BIN_PATH)head HG = hg ID = $(UTILS_COMMAND_PATH)id
--- a/make/common/shared/Defs-versions.gmk Mon May 09 01:47:05 2011 -0700 +++ b/make/common/shared/Defs-versions.gmk Mon May 09 01:57:28 2011 -0700 @@ -72,10 +72,6 @@ # REQUIRED_DXSDK_VER # Windows only: The version of DirectX SDK expected. # -# REQUIRED_FREE_SPACE -# The minimum disk space needed as determined by running 'du -sk' on a fully -# built workspace. -# # REQUIRED_FREETYPE_VERSION # If we are using freetype, the freetype version expected. # @@ -131,11 +127,6 @@ REQUIRED_OS_VERSION = 5.10 REQUIRED_OS_VARIANT_NAME = Solaris REQUIRED_OS_VARIANT_VERSION = $(REQUIRED_OS_VERSION) - ifeq ($(ARCH_FAMILY), sparc) - REQUIRED_FREE_SPACE = 1300000 - else - REQUIRED_FREE_SPACE = 1040000 - endif REQUIRED_COMPILER_NAME = Sun Studio 12 Update 1 REQUIRED_COMPILER_VERSION = SS12u1 # Cross-compilation compiler versions are target specific @@ -157,7 +148,6 @@ REQUIRED_OS_VERSION = 2.6 REQUIRED_OS_VARIANT_NAME = Fedora REQUIRED_OS_VARIANT_VERSION = 9 - REQUIRED_FREE_SPACE = 1460000 REQUIRED_ALSA_VERSION = 0.9.1 REQUIRED_COMPILER_NAME = GCC4 REQUIRED_COMPILER_VERSION = GCC4 @@ -187,7 +177,6 @@ REQUIRED_OS_VARIANT_VERSION = $(REQUIRED_OS_VERSION) REQUIRED_CYGWIN_VER = 4.0 REQUIRED_MKS_VER = 6.1 - REQUIRED_FREE_SPACE = 500000 REQUIRED_DXSDK_VER = 0x0900 ifeq ($(CC_VERSION),msvc) REQUIRED_COMPILER_NAME = Visual Studio 10
--- a/make/common/shared/Sanity-Settings.gmk Mon May 09 01:47:05 2011 -0700 +++ b/make/common/shared/Sanity-Settings.gmk Mon May 09 01:57:28 2011 -0700 @@ -192,8 +192,6 @@ ALL_SETTINGS+=$(call addRequiredVersionSetting,OS_VERSION) ALL_SETTINGS+=$(call addOptionalSetting,OS_VARIANT_NAME) ALL_SETTINGS+=$(call addOptionalSetting,OS_VARIANT_VERSION) -ALL_SETTINGS+=$(call addRequiredSetting,TEMP_FREE_SPACE) -ALL_SETTINGS+=$(call addRequiredSetting,FREE_SPACE) ALL_SETTINGS+=$(call addRequiredSetting,MB_OF_MEMORY)
--- a/make/common/shared/Sanity.gmk Mon May 09 01:47:05 2011 -0700 +++ b/make/common/shared/Sanity.gmk Mon May 09 01:57:28 2011 -0700 @@ -69,8 +69,6 @@ # Settings and rules to validate the JDK build environment. ifeq ($(PLATFORM), solaris) - FREE_SPACE := $(shell $(DF) -b $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$2;}') - TEMP_FREE_SPACE := $(shell $(DF) -b $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$2;}') # What kind of system we are using (Variations are Solaris and OpenSolaris) OS_VERSION := $(shell uname -r) OS_VARIANT_NAME := $(strip $(shell head -1 /etc/release | awk '{print $$1;}') ) @@ -88,8 +86,6 @@ endif ifeq ($(PLATFORM), linux) - FREE_SPACE := $(shell $(DF) --sync -kP $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$4;}') - TEMP_FREE_SPACE := $(shell $(DF) --sync -kP $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$4;}') # What kind of system we are using (Variation is the Linux vendor) OS_VERSION := $(shell uname -r) OS_VARIANT_NAME := $(shell \ @@ -118,8 +114,6 @@ endif ifeq ($(PLATFORM), windows) - FREE_SPACE := $(shell $(DF) -kP $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$4;}') - TEMP_FREE_SPACE := $(shell $(DF) -kP $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$4;}') # Windows 2000 is 5.0, Windows XP is 5.1, Windows 2003 is 5.2 # Assume 5.0 (Windows 2000) if systeminfo does not help WINDOWS_MAPPING-5.0 := Windows2000 @@ -715,18 +709,6 @@ " Either obtain these permissions or set ALT_OUTPUTDIR. \n" \ "" >> $(ERROR_FILE) ; \ fi - @# - @# OUTPUTDIR must have enough free space... - @# - @if [ $(FREE_SPACE) -lt $(REQUIRED_FREE_SPACE) ]; then \ - $(ECHO) "WARNING: You may not have enough free space in your OUTPUTDIR. The \n" \ - " current value of OUTPUTDIR is \n" \ - " $(OUTPUTDIR) \n" \ - " You need "$(REQUIRED_FREE_SPACE)" Kbytes free on this device to build \n" \ - " and it appears that only "$(FREE_SPACE)" Kbytes are free. \n" \ - " Either obtain more space or set ALT_OUTPUTDIR to a larger disk. \n" \ - "" >> $(WARNING_FILE) ; \ - fi ###################################################### # if specified, ALT_BOOTDIR must point to non-relative path if set
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties Mon May 09 01:47:05 2011 -0700 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties Mon May 09 01:57:28 2011 -0700 @@ -56,9 +56,9 @@ FileChooser.renameFileButtonText=Rename File FileChooser.renameFileButtonMnemonic=82 FileChooser.cancelButtonText=Cancel -FileChooser.cancelButtonMnemonic=67 +#FileChooser.cancelButtonMnemonic=67 FileChooser.saveButtonText=OK -FileChooser.saveButtonMnemonic=79 +#FileChooser.saveButtonMnemonic=79 FileChooser.openButtonText=OK FileChooser.openButtonMnemonic=79 FileChooser.saveDialogTitleText=Save @@ -79,9 +79,5 @@ 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 +#OptionPane.okButtonMnemonic=79 +#OptionPane.cancelButtonMnemonic=67
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties Mon May 09 01:47:05 2011 -0700 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties Mon May 09 01:57:28 2011 -0700 @@ -24,7 +24,7 @@ GTKColorChooserPanel.hueMnemonic=70 GTKColorChooserPanel.redText=Rot: -GTKColorChooserPanel.redMnemonic=79 +GTKColorChooserPanel.redMnemonic=82 GTKColorChooserPanel.saturationText=S\u00E4ttigung: GTKColorChooserPanel.saturationMnemonic=83
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties Mon May 09 01:47:05 2011 -0700 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties Mon May 09 01:57:28 2011 -0700 @@ -30,7 +30,7 @@ GTKColorChooserPanel.saturationMnemonic=83 GTKColorChooserPanel.greenText=Verde: -GTKColorChooserPanel.greenMnemonic=86 +GTKColorChooserPanel.greenMnemonic=69 GTKColorChooserPanel.valueText=Valor: GTKColorChooserPanel.valueMnemonic=86
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties Mon May 09 01:47:05 2011 -0700 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties Mon May 09 01:57:28 2011 -0700 @@ -30,7 +30,7 @@ GTKColorChooserPanel.saturationMnemonic=83 GTKColorChooserPanel.greenText=Vert : -GTKColorChooserPanel.greenMnemonic=86 +GTKColorChooserPanel.greenMnemonic=69 GTKColorChooserPanel.valueText=Valeur : GTKColorChooserPanel.valueMnemonic=86
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties Mon May 09 01:47:05 2011 -0700 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties Mon May 09 01:57:28 2011 -0700 @@ -30,7 +30,7 @@ GTKColorChooserPanel.saturationMnemonic=83 GTKColorChooserPanel.greenText=Verde: -GTKColorChooserPanel.greenMnemonic=86 +GTKColorChooserPanel.greenMnemonic=69 GTKColorChooserPanel.valueText=Valore: GTKColorChooserPanel.valueMnemonic=86
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties Mon May 09 01:47:05 2011 -0700 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties Mon May 09 01:57:28 2011 -0700 @@ -55,11 +55,11 @@ FileChooser.deleteFileButtonMnemonic=76 FileChooser.renameFileButtonText=\u30D5\u30A1\u30A4\u30EB\u306E\u540D\u524D\u5909\u66F4(R) FileChooser.renameFileButtonMnemonic=82 -FileChooser.cancelButtonText=\u53D6\u6D88(C) +FileChooser.cancelButtonText=\u53D6\u6D88 FileChooser.cancelButtonMnemonic=67 -FileChooser.saveButtonText=OK(O) +FileChooser.saveButtonText=OK FileChooser.saveButtonMnemonic=79 -FileChooser.openButtonText=OK(O) +FileChooser.openButtonText=OK FileChooser.openButtonMnemonic=79 FileChooser.saveDialogTitleText=\u4FDD\u5B58 FileChooser.openDialogTitleText=\u958B\u304F @@ -79,10 +79,6 @@ 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 +#OptionPane.okButtonMnemonic=79 +#OptionPane.cancelButtonMnemonic=67
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties Mon May 09 01:47:05 2011 -0700 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties Mon May 09 01:57:28 2011 -0700 @@ -55,11 +55,11 @@ FileChooser.deleteFileButtonMnemonic=76 FileChooser.renameFileButtonText=\uD30C\uC77C \uC774\uB984 \uBC14\uAFB8\uAE30(R) FileChooser.renameFileButtonMnemonic=82 -FileChooser.cancelButtonText=\uCDE8\uC18C(C) +FileChooser.cancelButtonText=\uCDE8\uC18C FileChooser.cancelButtonMnemonic=67 -FileChooser.saveButtonText=\uD655\uC778(O) +FileChooser.saveButtonText=\uD655\uC778 FileChooser.saveButtonMnemonic=79 -FileChooser.openButtonText=\uD655\uC778(O) +FileChooser.openButtonText=\uD655\uC778 FileChooser.openButtonMnemonic=79 FileChooser.saveDialogTitleText=\uC800\uC7A5 FileChooser.openDialogTitleText=\uC5F4\uAE30 @@ -79,10 +79,6 @@ 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 +#OptionPane.okButtonMnemonic=79 +#OptionPane.cancelButtonMnemonic=67
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties Mon May 09 01:47:05 2011 -0700 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties Mon May 09 01:57:28 2011 -0700 @@ -30,7 +30,7 @@ GTKColorChooserPanel.saturationMnemonic=83 GTKColorChooserPanel.greenText=Verde: -GTKColorChooserPanel.greenMnemonic=86 +GTKColorChooserPanel.greenMnemonic=68 GTKColorChooserPanel.valueText=Valor: GTKColorChooserPanel.valueMnemonic=86
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties Mon May 09 01:47:05 2011 -0700 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties Mon May 09 01:57:28 2011 -0700 @@ -39,7 +39,7 @@ GTKColorChooserPanel.blueMnemonic=66 GTKColorChooserPanel.colorNameText=F\u00E4rgnamn: -GTKColorChooserPanel.colorNameMnemonic=78 +GTKColorChooserPanel.colorNameMnemonic=70
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties Mon May 09 01:47:05 2011 -0700 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties Mon May 09 01:57:28 2011 -0700 @@ -55,11 +55,11 @@ FileChooser.deleteFileButtonMnemonic=76 FileChooser.renameFileButtonText=\u91CD\u547D\u540D\u6587\u4EF6(R) FileChooser.renameFileButtonMnemonic=82 -FileChooser.cancelButtonText=\u53D6\u6D88(C) +FileChooser.cancelButtonText=\u53D6\u6D88 FileChooser.cancelButtonMnemonic=67 -FileChooser.saveButtonText=\u786E\u5B9A(O) +FileChooser.saveButtonText=\u786E\u5B9A FileChooser.saveButtonMnemonic=79 -FileChooser.openButtonText=\u786E\u5B9A(O) +FileChooser.openButtonText=\u786E\u5B9A FileChooser.openButtonMnemonic=79 FileChooser.saveDialogTitleText=\u4FDD\u5B58 FileChooser.openDialogTitleText=\u6253\u5F00 @@ -79,10 +79,6 @@ 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 +#OptionPane.okButtonMnemonic=79 +#OptionPane.cancelButtonMnemonic=67
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties Mon May 09 01:47:05 2011 -0700 +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties Mon May 09 01:57:28 2011 -0700 @@ -55,11 +55,11 @@ FileChooser.deleteFileButtonMnemonic=76 FileChooser.renameFileButtonText=\u91CD\u65B0\u547D\u540D\u6A94\u6848(R) FileChooser.renameFileButtonMnemonic=82 -FileChooser.cancelButtonText=\u53D6\u6D88(C) +FileChooser.cancelButtonText=\u53D6\u6D88 FileChooser.cancelButtonMnemonic=67 -FileChooser.saveButtonText=\u78BA\u5B9A(O) +FileChooser.saveButtonText=\u78BA\u5B9A FileChooser.saveButtonMnemonic=79 -FileChooser.openButtonText=\u78BA\u5B9A(O) +FileChooser.openButtonText=\u78BA\u5B9A FileChooser.openButtonMnemonic=79 FileChooser.saveDialogTitleText=\u5132\u5B58 FileChooser.openDialogTitleText=\u958B\u555F @@ -79,10 +79,6 @@ 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 +#OptionPane.okButtonMnemonic=79 +#OptionPane.cancelButtonMnemonic=67
--- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties Mon May 09 01:47:05 2011 -0700 +++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties Mon May 09 01:57:28 2011 -0700 @@ -57,7 +57,7 @@ Specify a different file name. FileChooser.acceptAllFileFilterText=All Files FileChooser.cancelButtonText=Cancel -FileChooser.cancelButtonMnemonic=67 +#FileChooser.cancelButtonMnemonic=67 // not needed? FileChooser.saveButtonText=Save FileChooser.saveButtonMnemonic=83 // not needed? FileChooser.openButtonText=Open @@ -146,9 +146,9 @@ OptionPane.noButtonText=No OptionPane.noButtonMnemonic=78 OptionPane.okButtonText=OK -OptionPane.okButtonMnemonic=0 +#OptionPane.okButtonMnemonic=0 OptionPane.cancelButtonText=Cancel -OptionPane.cancelButtonMnemonic=0 +#OptionPane.cancelButtonMnemonic=0 OptionPane.titleText=Select an 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/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties Mon May 09 01:47:05 2011 -0700 +++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties Mon May 09 01:57:28 2011 -0700 @@ -55,7 +55,7 @@ FileChooser.renameErrorText={0}\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093 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 FileChooser.acceptAllFileFilterText=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB -FileChooser.cancelButtonText=\u53D6\u6D88(C) +FileChooser.cancelButtonText=\u53D6\u6D88 FileChooser.cancelButtonMnemonic=67 FileChooser.saveButtonText=\u4FDD\u5B58 FileChooser.saveButtonMnemonic=83 @@ -146,7 +146,7 @@ OptionPane.noButtonMnemonic=78 OptionPane.okButtonText=OK OptionPane.okButtonMnemonic=O -OptionPane.cancelButtonText=\u53D6\u6D88(0) +OptionPane.cancelButtonText=\u53D6\u6D88 OptionPane.cancelButtonMnemonic=0 OptionPane.titleText=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u9078\u629E # Title for the dialog for the showInputDialog methods. Only used if
--- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties Mon May 09 01:47:05 2011 -0700 +++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties Mon May 09 01:57:28 2011 -0700 @@ -55,7 +55,7 @@ FileChooser.renameErrorText={0}\uC758 \uC774\uB984\uC744 \uBC14\uAFC0 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. 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. FileChooser.acceptAllFileFilterText=\uBAA8\uB4E0 \uD30C\uC77C -FileChooser.cancelButtonText=\uCDE8\uC18C(C) +FileChooser.cancelButtonText=\uCDE8\uC18C FileChooser.cancelButtonMnemonic=67 FileChooser.saveButtonText=\uC800\uC7A5 FileChooser.saveButtonMnemonic=83 @@ -146,7 +146,7 @@ OptionPane.noButtonMnemonic=78 OptionPane.okButtonText=OK OptionPane.okButtonMnemonic=O -OptionPane.cancelButtonText=\uCDE8\uC18C(0) +OptionPane.cancelButtonText=\uCDE8\uC18C OptionPane.cancelButtonMnemonic=0 OptionPane.titleText=\uC635\uC158 \uC120\uD0DD # Title for the dialog for the showInputDialog methods. Only used if
--- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties Mon May 09 01:47:05 2011 -0700 +++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties Mon May 09 01:57:28 2011 -0700 @@ -96,7 +96,7 @@ ColorChooser.cancelText=Avbryt ColorChooser.resetText=\u00C5terst\u00E4ll # VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic -ColorChooser.resetMnemonic=82 +ColorChooser.resetMnemonic=84 ColorChooser.sampleText=Exempeltext Exempeltext ColorChooser.swatchesNameText=Prov ColorChooser.swatchesMnemonic=80
--- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties Mon May 09 01:47:05 2011 -0700 +++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties Mon May 09 01:57:28 2011 -0700 @@ -55,7 +55,7 @@ FileChooser.renameErrorText=\u65E0\u6CD5\u91CD\u547D\u540D{0} 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 FileChooser.acceptAllFileFilterText=\u6240\u6709\u6587\u4EF6 -FileChooser.cancelButtonText=\u53D6\u6D88(C) +FileChooser.cancelButtonText=\u53D6\u6D88 FileChooser.cancelButtonMnemonic=67 FileChooser.saveButtonText=\u4FDD\u5B58 FileChooser.saveButtonMnemonic=83 @@ -146,7 +146,7 @@ OptionPane.noButtonMnemonic=78 OptionPane.okButtonText=OK OptionPane.okButtonMnemonic=O -OptionPane.cancelButtonText=\u53D6\u6D88(0) +OptionPane.cancelButtonText=\u53D6\u6D88 OptionPane.cancelButtonMnemonic=0 OptionPane.titleText=\u9009\u62E9\u4E00\u4E2A\u9009\u9879 # Title for the dialog for the showInputDialog methods. Only used if
--- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties Mon May 09 01:47:05 2011 -0700 +++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties Mon May 09 01:57:28 2011 -0700 @@ -55,7 +55,7 @@ FileChooser.renameErrorText=\u7121\u6CD5\u91CD\u65B0\u547D\u540D {0} 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 FileChooser.acceptAllFileFilterText=\u6240\u6709\u6A94\u6848 -FileChooser.cancelButtonText=\u53D6\u6D88(C) +FileChooser.cancelButtonText=\u53D6\u6D88 FileChooser.cancelButtonMnemonic=67 FileChooser.saveButtonText=\u5132\u5B58 FileChooser.saveButtonMnemonic=83 @@ -146,7 +146,7 @@ OptionPane.noButtonMnemonic=78 OptionPane.okButtonText=OK OptionPane.okButtonMnemonic=O -OptionPane.cancelButtonText=\u53D6\u6D88(0) +OptionPane.cancelButtonText=\u53D6\u6D88 OptionPane.cancelButtonMnemonic=0 OptionPane.titleText=\u9078\u53D6\u4E00\u500B\u9078\u9805 # Title for the dialog for the showInputDialog methods. Only used if
--- a/src/share/classes/sun/print/resources/serviceui_fr.properties Mon May 09 01:47:05 2011 -0700 +++ b/src/share/classes/sun/print/resources/serviceui_fr.properties Mon May 09 01:57:28 2011 -0700 @@ -49,7 +49,7 @@ label.source.mnemonic=C label.status=Statut : label.username=Nom utilisateur : -label.username.mnemonic=U +label.username.mnemonic=O label.millimetres=(mm) label.inches=(po) label.topmargin=haut @@ -62,7 +62,7 @@ label.rightmargin.mnemonic=D # radiobutton.color=Couleur -radiobutton.color.mnemonic=U +radiobutton.color.mnemonic=C radiobutton.draftq=Brouillon radiobutton.draftq.mnemonic=L radiobutton.duplex=Duplex @@ -70,7 +70,7 @@ radiobutton.highq=Max. radiobutton.highq.mnemonic=X radiobutton.landscape=Paysage -radiobutton.landscape.mnemonic=S +radiobutton.landscape.mnemonic=Y radiobutton.monochrome=Monochrome radiobutton.monochrome.mnemonic=M radiobutton.normalq=Normal
--- a/src/share/classes/sun/print/resources/serviceui_pt_BR.properties Mon May 09 01:47:05 2011 -0700 +++ b/src/share/classes/sun/print/resources/serviceui_pt_BR.properties Mon May 09 01:57:28 2011 -0700 @@ -15,10 +15,10 @@ button.ok=OK button.print=Imprimir button.properties=Propriedades... -button.properties.mnemonic=R +button.properties.mnemonic=D # checkbox.collate=Agrupar -checkbox.collate.mnemonic=A +checkbox.collate.mnemonic=R checkbox.jobsheets=P\u00E1gina com Banner checkbox.jobsheets.mnemonic=B checkbox.printtofile=Imprimir em Arquivo @@ -38,7 +38,7 @@ label.numcopies=N\u00FAmero de c\u00F3pias: label.numcopies.mnemonic=O label.priority=Prioridade: -label.priority.mnemonic=R +label.priority.mnemonic=P label.psname=Nome: label.psname.mnemonic=N label.pstype=Tipo: @@ -59,7 +59,7 @@ label.leftmargin=esquerda: label.leftmargin.mnemonic=Q label.rightmargin=direita -label.rightmargin.mnemonic=R +label.rightmargin.mnemonic=D # radiobutton.color=Cor radiobutton.color.mnemonic=O @@ -68,7 +68,7 @@ radiobutton.duplex=Duplex radiobutton.duplex.mnemonic=D radiobutton.highq=Alta -radiobutton.highq.mnemonic=A +radiobutton.highq.mnemonic=T radiobutton.landscape=Paisagem radiobutton.landscape.mnemonic=P radiobutton.monochrome=Monocrom\u00E1tico @@ -76,7 +76,7 @@ radiobutton.normalq=Normal radiobutton.normalq.mnemonic=N radiobutton.oneside=Um Lado -radiobutton.oneside.mnemonic=O +radiobutton.oneside.mnemonic=L radiobutton.portrait=Retrato radiobutton.portrait.mnemonic=R radiobutton.rangeall=Tudo @@ -86,7 +86,7 @@ radiobutton.revlandscape=Paisagem Invertida radiobutton.revlandscape.mnemonic=N radiobutton.revportrait=Retrato Invertido -radiobutton.revportrait.mnemonic=I +radiobutton.revportrait.mnemonic=E radiobutton.tumble=Virar radiobutton.tumble.mnemonic=V # The vkMnemonics correspond with the constants defined in KeyEvent, eg @@ -96,7 +96,7 @@ tab.general=Geral tab.general.vkMnemonic=71 tab.pagesetup=Configura\u00E7\u00E3o de P\u00E1gina -tab.pagesetup.vkMnemonic=80 +tab.pagesetup.vkMnemonic=67 # error.pagerange=Faixa de p\u00E1ginas inv\u00E1lida; insira novamente os valores (por exemplo, 1-3,5,7-10) error.destination=Nome de arquivo inv\u00E1lido; tente novamente