diff --git a/.hgtags b/.hgtags
index 68e25fecbb677384a81c2c33d116d7ee05507dac..8a7ff58323d6d7414935b802f859d330764ffa40 100644
--- a/.hgtags
+++ b/.hgtags
@@ -115,3 +115,4 @@ aa13e7702cd9d8aca9aa38f1227f966990866944 jdk7-b136
 60d3d55dcc9c31a30ced9caa6ef5c0dcd7db031d jdk7-b138
 d80954a89b49fda47c0c5cace65a17f5a758b8bd jdk7-b139
 9315c733fb17ddfb9fb44be7e0ffea37bf3c727d jdk7-b140
+63eeefe118da18c75ba3d36266768cd1ccaaca6b jdk7-b141
diff --git a/make/common/Defs-linux.gmk b/make/common/Defs-linux.gmk
index 515691dd29303280dc047fd04e975e12584c6d1c..123d1b39be5b474a113eb8b8dcb89eb3a77c9a9f 100644
--- a/make/common/Defs-linux.gmk
+++ b/make/common/Defs-linux.gmk
@@ -354,7 +354,7 @@ HAVE_DPS = no
 # 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)
diff --git a/make/common/Program.gmk b/make/common/Program.gmk
index 9fdde6d9745446d2eb3c55de51385b098d84a579..38adb13b052c153572487b2e32c789027f839421 100644
--- a/make/common/Program.gmk
+++ b/make/common/Program.gmk
@@ -55,10 +55,13 @@ program_default_rule: all
 
 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
 
diff --git a/make/common/Release.gmk b/make/common/Release.gmk
index fbb9f0d55f4c9bc8a95a1b9deebef3e60413a05c..277974e628456deb2ef011ff0fadb139664aa215 100644
--- a/make/common/Release.gmk
+++ b/make/common/Release.gmk
@@ -164,7 +164,7 @@ endif # solaris
 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 @@ for manbase in $(MANBASEDIRS:%=%/$(MAN1SUBDIR)) ; do \
 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
 
diff --git a/make/common/shared/Defs-utils.gmk b/make/common/shared/Defs-utils.gmk
index a5b1802c46b1956aa651f75bcb45c08f33302158..1cebe93ca5b8226a0b25835ea189dc80fba58b8d 100644
--- a/make/common/shared/Defs-utils.gmk
+++ b/make/common/shared/Defs-utils.gmk
@@ -109,6 +109,8 @@ FMT            = $(UTILS_COMMAND_PATH)fmt
 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
diff --git a/make/common/shared/Defs-versions.gmk b/make/common/shared/Defs-versions.gmk
index 05d81efec0887010523965f0fb8849522f10c507..6e00b22f00f640f6672f1b429500baa8d60208dd 100644
--- a/make/common/shared/Defs-versions.gmk
+++ b/make/common/shared/Defs-versions.gmk
@@ -72,10 +72,6 @@ endif
 # 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 @@ ifeq ($(PLATFORM), solaris)
   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 @@ ifeq ($(PLATFORM), linux)
   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 @@ ifeq ($(PLATFORM), windows)
   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
diff --git a/make/common/shared/Sanity-Settings.gmk b/make/common/shared/Sanity-Settings.gmk
index 36179fed5fdeb4b9533a27aaaec7da5091a605d5..ecc39c1a72412713309ee28977937b649b53fd88 100644
--- a/make/common/shared/Sanity-Settings.gmk
+++ b/make/common/shared/Sanity-Settings.gmk
@@ -192,8 +192,6 @@ endif
 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)
 
 
diff --git a/make/common/shared/Sanity.gmk b/make/common/shared/Sanity.gmk
index 99f64fd3842763e6e5848d8e30e825cf41642905..1dbedb17a75523615c4b1b6f05175589ee4d9760 100644
--- a/make/common/shared/Sanity.gmk
+++ b/make/common/shared/Sanity.gmk
@@ -69,8 +69,6 @@ endef
 # 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 @@ ifeq ($(PLATFORM), solaris)
 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 @@ ifeq ($(PLATFORM), linux)
 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 @@ sane-outputdir:
 	    "      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
diff --git a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties
index 904a49352eb562d891cc7d6a8d0a465f9e610839..45f4a4dc7a659ea52ebee7faa371a2ca634b70b4 100644
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties
@@ -56,9 +56,9 @@ FileChooser.deleteFileButtonMnemonic=76
 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.renameFileDialogText=Rename file "{0}" to
 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
diff --git a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties
index 571bc0afae3287e56b6903a1721a506d550ddab4..3edb256c427f5468db77113aa890505fd09f40b8 100644
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties
@@ -24,7 +24,7 @@ GTKColorChooserPanel.hueText=Farbton:
 GTKColorChooserPanel.hueMnemonic=70
 
 GTKColorChooserPanel.redText=Rot:
-GTKColorChooserPanel.redMnemonic=79
+GTKColorChooserPanel.redMnemonic=82
 
 GTKColorChooserPanel.saturationText=S\u00E4ttigung:
 GTKColorChooserPanel.saturationMnemonic=83
diff --git a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties
index 6daa4d9b441811eac1093152b215d5755fedd97e..4766de9167e7c7b7f9feb0ca12f5649cbfc14a60 100644
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties
@@ -30,7 +30,7 @@ GTKColorChooserPanel.saturationText=Saturaci\u00F3n:
 GTKColorChooserPanel.saturationMnemonic=83
 
 GTKColorChooserPanel.greenText=Verde:
-GTKColorChooserPanel.greenMnemonic=86
+GTKColorChooserPanel.greenMnemonic=69
 
 GTKColorChooserPanel.valueText=Valor:
 GTKColorChooserPanel.valueMnemonic=86
diff --git a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties
index 9f4e0e559f7051d45843407f2c0655ad1cbf3915..68f07d2e469e497c00592163a3f1ff50a2b28b10 100644
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties
@@ -30,7 +30,7 @@ GTKColorChooserPanel.saturationText=Saturation :
 GTKColorChooserPanel.saturationMnemonic=83
 
 GTKColorChooserPanel.greenText=Vert :
-GTKColorChooserPanel.greenMnemonic=86
+GTKColorChooserPanel.greenMnemonic=69
 
 GTKColorChooserPanel.valueText=Valeur :
 GTKColorChooserPanel.valueMnemonic=86
diff --git a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties
index 21cd8f7782657aa4059e7cc7d603b5ea222ed48f..70146898dac48ad096117605efbb4d203350bcce 100644
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties
@@ -30,7 +30,7 @@ GTKColorChooserPanel.saturationText=Saturazione:
 GTKColorChooserPanel.saturationMnemonic=83
 
 GTKColorChooserPanel.greenText=Verde:
-GTKColorChooserPanel.greenMnemonic=86
+GTKColorChooserPanel.greenMnemonic=69
 
 GTKColorChooserPanel.valueText=Valore:
 GTKColorChooserPanel.valueMnemonic=86
diff --git a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties
index c7ff0bb97a21c52606eed8d25b0863ad9f1912db..30560e916200fd9ef39b921cb6c4af232de6c645 100644
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties
@@ -55,11 +55,11 @@ FileChooser.deleteFileButtonText=\u30D5\u30A1\u30A4\u30EB\u306E\u524A\u9664(L)
 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.renameFileDialogText=\u30D5\u30A1\u30A4\u30EB"{0}"\u3092\u6B21\u306E
 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
 
diff --git a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties
index cb029e7b0253b1efa2ed83e8df385c6298c9d3ce..27802636b7ce059b16cc6b134cb8bf116f895386 100644
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties
@@ -55,11 +55,11 @@ FileChooser.deleteFileButtonText=\uD30C\uC77C \uC0AD\uC81C(L)
 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.renameFileDialogText="{0}" \uD30C\uC77C\uC758 \uC774\uB984 \uBC14\uA
 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
 
diff --git a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties
index 6fb63b6764f54f96fe673ece936926d4f3e84a3b..35a510d99474eecd0259b52ae52101a6bcfcac38 100644
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties
@@ -30,7 +30,7 @@ GTKColorChooserPanel.saturationText=Satura\u00E7\u00E3o:
 GTKColorChooserPanel.saturationMnemonic=83
 
 GTKColorChooserPanel.greenText=Verde:
-GTKColorChooserPanel.greenMnemonic=86
+GTKColorChooserPanel.greenMnemonic=68
 
 GTKColorChooserPanel.valueText=Valor:
 GTKColorChooserPanel.valueMnemonic=86
diff --git a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties
index cfde4686b9b599be40d4c7594c2c39de6802bafd..9dda1e0a50f1f8d3b793f2e6e5e076ba5e85aa25 100644
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties
@@ -39,7 +39,7 @@ GTKColorChooserPanel.blueText=Bl\u00E5:
 GTKColorChooserPanel.blueMnemonic=66
 
 GTKColorChooserPanel.colorNameText=F\u00E4rgnamn:
-GTKColorChooserPanel.colorNameMnemonic=78
+GTKColorChooserPanel.colorNameMnemonic=70
 
 
 
diff --git a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties
index 58506b0107da6c33e669e866295eb75aa72b72fb..9c7793c62ff5e77df6cb06691fe2c50cb79f899a 100644
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties
@@ -55,11 +55,11 @@ FileChooser.deleteFileButtonText=\u5220\u9664\u6587\u4EF6(L)
 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.renameFileDialogText=\u5C06\u6587\u4EF6 "{0}" \u91CD\u547D\u540D\u4E
 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
 
diff --git a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties
index ac8c732dc6d8b99e2ef68f77c62d85b12e18729e..68fdd917034e6af858029beaa11d2dd971fe147c 100644
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties
@@ -55,11 +55,11 @@ FileChooser.deleteFileButtonText=\u522A\u9664\u6A94\u6848(L)
 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.renameFileDialogText=\u5C07\u6A94\u6848 "{0}" \u91CD\u65B0\u547D\u54
 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
 
diff --git a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties
index 87e3bde708e0cdbbec463916fcca7270e7cd5686..109538ac90e1c3879f305b978931153d56913e5f 100644
--- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties
+++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties
@@ -57,7 +57,7 @@ FileChooser.renameErrorFileExistsText=Cannot rename {0}: A file with the name yo
   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.yesButtonMnemonic=89
 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.
diff --git a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties
index 9382e0abc041ec8b4e45a6d57d47097ff1fbdf1a..7b946411855905f9a6ad8cee709c5aa5f1d9892f 100644
--- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties
+++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties
@@ -55,7 +55,7 @@ FileChooser.renameErrorTitleText=\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30D
 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.noButtonText=\u3044\u3044\u3048(N)
 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
diff --git a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties
index b8f70de37ff19226b8b391bd075e9e1793b5d3fa..592d46724421b949d88e62a09388a1484b5c07f0 100644
--- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties
+++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties
@@ -55,7 +55,7 @@ FileChooser.renameErrorTitleText=\uD30C\uC77C \uB610\uB294 \uD3F4\uB354 \uC774\u
 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.noButtonText=\uC544\uB2C8\uC624(N)
 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
diff --git a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties
index fef16139cf48d7fb0b7d3c2575d8a587b799185f..c28dfbd7ca89417d3abfe14b8b14ede0b5bbb3be 100644
--- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties
+++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties
@@ -96,7 +96,7 @@ ColorChooser.okText=OK
 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
diff --git a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties
index 212b1753539a2af6abee714f68dfb2ac0e51aa5c..10cecd846d9fa1d86f8a0eaa1e7dd116908048ee 100644
--- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties
+++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties
@@ -55,7 +55,7 @@ FileChooser.renameErrorTitleText=\u91CD\u547D\u540D\u6587\u4EF6\u6216\u6587\u4EF
 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.noButtonText=\u5426(N)
 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
diff --git a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties
index ef267aaf8c5e9a027a5def2de5ca623bf2ed897d..53a4bfb989b84e3e6deb5d14ff0ad198c8ed9a69 100644
--- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties
+++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties
@@ -55,7 +55,7 @@ FileChooser.renameErrorTitleText=\u91CD\u65B0\u547D\u540D\u6A94\u6848\u6216\u8CC
 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.noButtonText=\u5426(N)
 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
diff --git a/src/share/classes/sun/print/resources/serviceui_fr.properties b/src/share/classes/sun/print/resources/serviceui_fr.properties
index 7c64e8a413893d6498bffefe9bf4309048c04b45..a74d5677454b8eb8546fab456595b1a1a5d7eff1 100644
--- a/src/share/classes/sun/print/resources/serviceui_fr.properties
+++ b/src/share/classes/sun/print/resources/serviceui_fr.properties
@@ -49,7 +49,7 @@ label.source=Source :
 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=droite
 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.duplex.mnemonic=D
 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
diff --git a/src/share/classes/sun/print/resources/serviceui_pt_BR.properties b/src/share/classes/sun/print/resources/serviceui_pt_BR.properties
index 7797a2a9c066138855384f28e6ca2fafc2565a84..d82178f3a4ecb88f58e51b5d4782512e3a3c9c62 100644
--- a/src/share/classes/sun/print/resources/serviceui_pt_BR.properties
+++ b/src/share/classes/sun/print/resources/serviceui_pt_BR.properties
@@ -15,10 +15,10 @@ button.cancel=Cancelar
 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.jobname.mnemonic=J
 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.bottommargin.mnemonic=I
 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.draftq.mnemonic=R
 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.monochrome.mnemonic=M
 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.rangepages.mnemonic=P
 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.appearance.vkMnemonic=65
 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