changeset 3679:e8cb66d0416e

Merge from main OpenJDK repository
author Greg Lewis <glewis@eyesbeyond.com>
date Sun, 20 Feb 2011 12:46:58 -0800
parents e0ea4fbc918c 89055b6d9ae0
children b2cf8f60a558
files make/com/sun/java/pack/Makefile make/common/Defs-linux.gmk make/common/Defs-solaris.gmk make/common/Defs.gmk make/common/Program.gmk make/common/Release.gmk make/common/shared/Defs-utils.gmk make/common/shared/Defs-versions.gmk make/common/shared/Defs.gmk make/common/shared/Platform.gmk make/common/shared/Sanity-Settings.gmk make/common/shared/Sanity.gmk make/java/Makefile make/java/hpi/Makefile make/java/hpi/hpi_common.gmk make/java/hpi/native/Makefile make/java/hpi/native/mapfile-vers make/java/hpi/native/reorder-i586 make/java/hpi/native/reorder-sparc make/java/hpi/native/reorder-sparcv9 make/java/hpi/windows/Makefile make/java/nio/Makefile make/java/redist/Makefile make/sun/awt/Makefile make/sun/jkernel/FILES_c_windows.gmk make/sun/jkernel/FILES_java.gmk make/sun/jkernel/Makefile make/sun/xawt/Makefile make/tools/reorder/Makefile src/share/bin/java.c src/share/classes/java/io/TempFileHelper.java src/share/classes/java/nio/file/FileRef.java src/share/classes/java/nio/file/attribute/Attributes.java src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributeView.java src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributes.java src/share/classes/sun/font/SunFontManager.java src/share/classes/sun/java2d/SunGraphicsEnvironment.java src/share/classes/sun/jkernel/BackgroundDownloader.java src/share/classes/sun/jkernel/Bundle.java src/share/classes/sun/jkernel/BundleCheck.java src/share/classes/sun/jkernel/ByteArrayToFromHexDigits.java src/share/classes/sun/jkernel/DigestOutputStream.java src/share/classes/sun/jkernel/DownloadManager.java src/share/classes/sun/jkernel/KernelError.java src/share/classes/sun/jkernel/Mutex.java src/share/classes/sun/jkernel/StandaloneByteArrayAccess.java src/share/classes/sun/jkernel/StandaloneMessageDigest.java src/share/classes/sun/jkernel/StandaloneSHA.java src/share/classes/sun/tools/jar/Main.java src/share/demo/zipfs src/share/hpi/export/bool.h src/share/hpi/export/dll.h src/share/hpi/export/hpi.h src/share/hpi/include/hpi_impl.h src/share/hpi/include/vm_calls.h src/share/hpi/src/hpi.c src/share/native/java/util/zip/zip_util.c src/share/native/sun/security/ec/impl/ecc_impl.h src/share/native/sun/security/ec/impl/ecdecode.c src/share/native/sun/security/ec/impl/oid.c src/share/native/sun/security/ec/impl/secitem.c src/solaris/classes/sun/awt/X11FontManager.java src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.5.8.properties src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.5.9.properties src/solaris/hpi/export/byteorder_md.h src/solaris/hpi/export/hpi_md.h src/solaris/hpi/export/io_md.h src/solaris/hpi/export/path_md.h src/solaris/hpi/export/timeval_md.h src/solaris/hpi/include/hpi_init.h src/solaris/hpi/include/interrupt.h src/solaris/hpi/include/largefile.h src/solaris/hpi/include/largefile_bsd.h src/solaris/hpi/include/largefile_linux.h src/solaris/hpi/include/largefile_solaris.h src/solaris/hpi/native_threads/include/condvar_md.h src/solaris/hpi/native_threads/include/monitor_md.h src/solaris/hpi/native_threads/include/mutex_md.h src/solaris/hpi/native_threads/include/np.h src/solaris/hpi/native_threads/include/porting.h src/solaris/hpi/native_threads/include/threads_md.h src/solaris/hpi/native_threads/src/condvar_md.c src/solaris/hpi/native_threads/src/interrupt_md.c src/solaris/hpi/native_threads/src/monitor_md.c src/solaris/hpi/native_threads/src/mutex_md.c src/solaris/hpi/native_threads/src/sys_api_td.c src/solaris/hpi/native_threads/src/threads_bsd.c src/solaris/hpi/native_threads/src/threads_linux.c src/solaris/hpi/native_threads/src/threads_md.c src/solaris/hpi/native_threads/src/threads_solaris.c src/solaris/hpi/src/interrupt.c src/solaris/hpi/src/linker_md.c src/solaris/hpi/src/memory_md.c src/solaris/hpi/src/system_md.c src/solaris/native/sun/awt/fontpath.c src/solaris/native/sun/management/FileSystemImpl.c src/solaris/native/sun/nio/ch/FileChannelImpl.c src/solaris/native/sun/nio/ch/FileDispatcherImpl.c src/solaris/native/sun/nio/ch/FileKey.c src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c src/windows/hpi/export/byteorder_md.h src/windows/hpi/export/hpi_md.h src/windows/hpi/export/io_md.h src/windows/hpi/export/path_md.h src/windows/hpi/export/timeval_md.h src/windows/hpi/include/monitor_md.h src/windows/hpi/include/mutex_md.h src/windows/hpi/include/threads_md.h src/windows/hpi/src/linker_md.c src/windows/hpi/src/memory_md.c src/windows/hpi/src/monitor_md.c src/windows/hpi/src/path_md.c src/windows/hpi/src/socket_md.c src/windows/hpi/src/sys_api_md.c src/windows/hpi/src/system_md.c src/windows/hpi/src/threads_md.c src/windows/native/sun/jkernel/DownloadDialog.cpp src/windows/native/sun/jkernel/DownloadDialog.h src/windows/native/sun/jkernel/DownloadHelper.cpp src/windows/native/sun/jkernel/DownloadHelper.h src/windows/native/sun/jkernel/graphics/bullet.bmp src/windows/native/sun/jkernel/graphics/cautionshield32.bmp src/windows/native/sun/jkernel/graphics/java-icon.ico src/windows/native/sun/jkernel/graphics/masthead.bmp src/windows/native/sun/jkernel/graphics/warningmasthead.bmp src/windows/native/sun/jkernel/kernel.cpp src/windows/native/sun/jkernel/kernel.def src/windows/native/sun/jkernel/kernel.h src/windows/native/sun/jkernel/kernel.rc src/windows/native/sun/jkernel/kernel_de.rc src/windows/native/sun/jkernel/kernel_en.rc src/windows/native/sun/jkernel/kernel_es.rc src/windows/native/sun/jkernel/kernel_fr.rc src/windows/native/sun/jkernel/kernel_it.rc src/windows/native/sun/jkernel/kernel_ja.rc src/windows/native/sun/jkernel/kernel_ko.rc src/windows/native/sun/jkernel/kernel_pt_BR.rc src/windows/native/sun/jkernel/kernel_sv.rc src/windows/native/sun/jkernel/kernel_zh.rc src/windows/native/sun/jkernel/kernel_zh_TW.rc src/windows/native/sun/jkernel/resource.h src/windows/native/sun/jkernel/stdafx.cpp src/windows/native/sun/jkernel/stdafx.h src/windows/native/sun/jkernel/version.rc test/java/net/InetAddress/B4762344.java test/java/net/InetAddress/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor test/java/net/InetAddress/Simple1NameServiceDescriptor.java test/java/net/InetAddress/Simple2NameServiceDescriptor.java test/java/net/InetAddress/SimpleNameService.java test/java/nio/file/Files/ContentType.java test/java/nio/file/Files/CopyAndMove.java test/java/nio/file/Files/CreateFileTree.java test/java/nio/file/Files/ForceLoad.java test/java/nio/file/Files/META-INF/services/java.nio.file.spi.FileTypeDetector test/java/nio/file/Files/MaxDepth.java test/java/nio/file/Files/PrintFileTree.java test/java/nio/file/Files/SimpleFileTypeDetector.java test/java/nio/file/Files/SkipSiblings.java test/java/nio/file/Files/TerminateWalk.java test/java/nio/file/Files/WalkWithSecurity.java test/java/nio/file/Files/denyAll.policy test/java/nio/file/Files/grantAll.policy test/java/nio/file/Files/grantTopOnly.policy test/java/nio/file/Files/walk_file_tree.sh test/java/nio/file/Path/CheckPermissions.java test/java/nio/file/Path/CopyAndMove.java test/java/nio/file/Path/DeleteOnClose.java test/java/nio/file/Path/FileAttributes.java test/java/nio/file/Path/InterruptCopy.java test/java/nio/file/Path/Links.java test/java/nio/file/Path/PassThroughFileSystem.java test/java/nio/file/Path/SBC.java test/java/nio/file/Path/TemporaryFiles.java test/java/nio/file/Path/delete_on_close.sh test/java/nio/file/attribute/FileStoreAttributeView/Basic.java test/sun/net/InetAddress/nameservice/B6442088.java test/sun/net/InetAddress/nameservice/CacheTest.java test/sun/net/InetAddress/nameservice/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor test/sun/net/InetAddress/nameservice/SimpleNameService.java test/sun/net/InetAddress/nameservice/SimpleNameServiceDescriptor.java
diffstat 1006 files changed, 44316 insertions(+), 58500 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jan 27 22:35:53 2011 -0800
+++ b/.hgtags	Sun Feb 20 12:46:58 2011 -0800
@@ -102,3 +102,6 @@
 0a56bdd709d01c1663047e55201d19152ffd3d69 jdk7-b125
 8361ef97a0f90086c9048beaf7cea1a37216c4cd jdk7-b126
 29e09de1d0b4f84faea114cf10b3ec08b59acc4e jdk7-b127
+f08682e23279d6cccbdcafda1eb0647ba4900874 jdk7-b128
+14cd5d54a8d0b9c368d60ea83a066735b9931015 jdk7-b129
+bdc069d3f9101f89ec3f81c2950ee2d68fa846d3 jdk7-b130
--- a/make/Makefile	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/Makefile	Sun Feb 20 12:46:58 2011 -0800
@@ -100,7 +100,6 @@
 DEVTOOLS_PATH.desc         = Directory containing zip and unzip
 CUPS_HEADERS_PATH.desc     = Include directory location for CUPS header files
 DXSDK_PATH.desc            = Root directory of DirectX SDK
-MSVCRT_DLL_PATH.desc       = Directory containing mscvrt.dll
 
 # Make variables to print out (description and value)
 VARIABLE_PRINTVAL_LIST +=       \
@@ -133,12 +132,10 @@
 ifeq ($(PLATFORM), windows)
 
 VARIABLE_PRINTVAL_LIST +=       \
-    DXSDK_PATH                  \
-    MSVCRT_DLL_PATH
+    DXSDK_PATH
 
 VARIABLE_CHECKDIR_LIST +=       \
-    DXSDK_PATH                  \
-    MSVCRT_DLL_PATH
+    DXSDK_PATH
 
 endif
 
--- a/make/com/sun/java/pack/Makefile	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/com/sun/java/pack/Makefile	Sun Feb 20 12:46:58 2011 -0800
@@ -164,6 +164,7 @@
 	$(MT) /manifest $(OBJDIR)/unpack200$(EXE_SUFFIX).manifest /outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1
 endif
 	$(CP) $(TEMPDIR)/unpack200$(EXE_SUFFIX) $(UNPACK_EXE)
+	@$(call binary_file_verification,$@)
 	$(install-module-file)
 
 ifeq ($(PLATFORM), windows) 
--- a/make/common/Defs-linux.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/common/Defs-linux.gmk	Sun Feb 20 12:46:58 2011 -0800
@@ -75,15 +75,6 @@
 CC_PROGRAM_OUTPUT_FLAG = -o #trailing blank required!
 
 #
-# Default HPI libraries. Build will build only native, unless
-# overriden at the make command line. This makes it convenient for
-# people doing, say, a pthreads port -- they can create a posix
-# directory here, and say "gnumake HPIS=posix" at the top
-# level.
-#
-HPIS = native
-
-#
 # Default optimization
 #
 
--- a/make/common/Defs-solaris.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/common/Defs-solaris.gmk	Sun Feb 20 12:46:58 2011 -0800
@@ -75,15 +75,6 @@
 CC_PROGRAM_OUTPUT_FLAG = -o #trailing blank required!
 
 #
-# Default HPI libraries. Build will build only native unless
-# overriden at the make command line. This makes it convenient for
-# people doing, say, a pthreads port -- they can create a posix
-# directory here, and say "gnumake HPIS=posix" at the top
-# level.
-#
-HPIS = native
-
-#
 # Java default optimization (-x04/-O2) etc.  Applies to the VM.
 #
 ifndef OPTIMIZATION_LEVEL
--- a/make/common/Defs-windows.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/common/Defs-windows.gmk	Sun Feb 20 12:46:58 2011 -0800
@@ -43,7 +43,6 @@
 # The suffix applied to scripts (.bat for windows, nothing for unix)
 SCRIPT_SUFFIX = .bat
 
-HPIS = windows
 # LIB_LOCATION, which for windows identifies where .exe files go, may be
 # set by each GNUmakefile. The default is BINDIR.
 ifndef LIB_LOCATION
@@ -68,28 +67,27 @@
 
 # The following DLL's are considered MS runtime libraries and should
 #     not to be REBASEd, see deploy/make/common/Release.gmk.
-#     msvcrt.dll, msvcrnn.dll [msvcr71 or msvcr80 or msvcr90] : Microsoft runtimes
-MS_RUNTIME_LIBRARIES = msvcrt.dll
+#     msvcr*.dll: Microsoft runtimes
 ifeq ($(ARCH_DATA_MODEL), 32)
   ifeq ($(COMPILER_VERSION), VS2003)
     MSVCRNN_DLL = msvcr71.dll
     MSVCPNN_DLL = msvcp71.dll
-    MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
+    MS_RUNTIME_LIBRARIES = msvcrt.dll $(MSVCRNN_DLL)
   endif
   ifeq ($(COMPILER_VERSION), VS2005)
     MSVCRNN_DLL = msvcr80.dll
     MSVCPNN_DLL = msvcp80.dll
-    MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
+    MS_RUNTIME_LIBRARIES = msvcrt.dll $(MSVCRNN_DLL)
   endif
   ifeq ($(COMPILER_VERSION), VS2008)
     MSVCRNN_DLL = msvcr90.dll
     MSVCPNN_DLL = msvcp90.dll
-    MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
+    MS_RUNTIME_LIBRARIES = msvcrt.dll $(MSVCRNN_DLL)
   endif
   ifeq ($(COMPILER_VERSION), VS2010)
     MSVCRNN_DLL = msvcr100.dll
     MSVCPNN_DLL = msvcp100.dll
-    MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
+    MS_RUNTIME_LIBRARIES = $(MSVCRNN_DLL)
   endif
 endif
 
@@ -97,12 +95,12 @@
   ifeq ($(COMPILER_VERSION), VS2008)
     MSVCRNN_DLL = msvcr90.dll
     MSVCPNN_DLL = msvcp90.dll
-    MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
+    MS_RUNTIME_LIBRARIES = msvcrt.dll $(MSVCRNN_DLL)
   endif
   ifeq ($(COMPILER_VERSION), VS2010)
     MSVCRNN_DLL = msvcr100.dll
     MSVCPNN_DLL = msvcp100.dll
-    MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
+    MS_RUNTIME_LIBRARIES = $(MSVCRNN_DLL)
   endif
 endif
 
@@ -284,7 +282,7 @@
     MS_RUNTIME_OPTION=-MTd
   else
     # This MS debugging flag forces a dependence on the debug
-    #     version of the runtime library (MSVCRTD.DLL), as does -MDd.
+    #     version of the runtime library (MSVCR*D.DLL), as does -MDd.
     #     We cannot re-distribute this debug runtime.
     MS_RUNTIME_OPTION=-MDd
   endif
@@ -365,10 +363,6 @@
 
   # LFLAGS are the flags given to $(LINK) and used to build the actual DLL file
   BASELFLAGS = -nologo /opt:REF /incremental:no
-ifdef MT
-    # VS2005, VS2008, and beyond: ask LINK to generate manifests for .dll & .exe
-    BASELFLAGS += /manifest
-endif
 
   LFLAGS = $(BASELFLAGS) $(LDEBUG) $(EXTRA_LFLAGS) $(LFLAGS_$(COMPILER_VERSION))
   LDDFLAGS += $(LFLAGS_$(COMPILER_VERSION))
--- a/make/common/Defs.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/common/Defs.gmk	Sun Feb 20 12:46:58 2011 -0800
@@ -306,10 +306,9 @@
 # An attempt is made to generate unique enough directories for the
 # generated files to not have name collisisons. Most build units
 # defines PRODUCT (except Release.gmk), but then they may or may 
-# not define PACKAGE, THREADIR (only HPI uses this), PROGRAM, and 
-# LIBRARY. This code chunk attempts to generate a unique 
-# OBJDIR/CLASSHDRDIR for each build unit based on which of those 
-# values are set within each build unit.
+# not define PACKAGE, PROGRAM, and LIBRARY. This code attempts to
+# generate a unique OBJDIR/CLASSHDRDIR for each build unit based
+# on which of those values are set within each build unit.
 
 UNIQUE_LOCATION_STRING = tmp
 
@@ -333,10 +332,6 @@
   endif
 endif
 
-ifneq ($(THREADDIR),)
-  UNIQUE_LOCATION_STRING += /$(THREADDIR)
-endif
-
 #
 # Build units may or may not define MODULE.  Default to "other".
 #
--- a/make/common/Demo.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/common/Demo.gmk	Sun Feb 20 12:46:58 2011 -0800
@@ -73,8 +73,11 @@
 
 # Destination "src" directory
 DEMO_BUILD_SRCDIR     = $(DEMO_BUILD_AREA)/src
-DEMO_BUILD_SRCZIP     = $(DEMO_BUILD_AREA)/src.zip
-DEMO_SOURCE_ZIP       = $(DEMO_DESTDIR)/src.zip
+
+ifndef DEMO_SKIP_SRCZIP
+  DEMO_BUILD_SRCZIP     = $(DEMO_BUILD_AREA)/src.zip
+  DEMO_SOURCE_ZIP       = $(DEMO_DESTDIR)/src.zip
+endif
 
 # Place to hold the jar image we are creating
 DEMO_JAR_IMAGE      = $(DEMO_BUILD_AREA)/jar_image
@@ -258,14 +261,16 @@
 
 endif
 
-# Create a src.zip file
-$(DEMO_BUILD_SRCZIP): $(DEMO_FULL_SOURCES)
+ifndef DEMO_SKIP_SRCZIP
+  # Create a src.zip file
+  $(DEMO_BUILD_SRCZIP): $(DEMO_FULL_SOURCES)
 	@$(prep-target)
 	$(CD) $(DEMO_BUILD_AREA)/src && $(ZIPEXE) -q -r ../$(@F) .
 
-# Install the destination src.zip file and create the src tree
-$(DEMO_SOURCE_ZIP): $(DEMO_BUILD_SRCZIP)
+  # Install the destination src.zip file and create the src tree
+  $(DEMO_SOURCE_ZIP): $(DEMO_BUILD_SRCZIP)
 	$(install-file)
+endif
 
 # Native library building
 ifdef DEMO_LIBRARY
@@ -289,6 +294,7 @@
 	@$(prep-target)
 	$(LINK.demo) $(SHARED_LIBRARY_FLAG) $(CC_PROGRAM_OUTPUT_FLAG)$@ \
 	    $(DEMO_FULL_OBJECTS) $(LDLIBS.demo)
+	@$(call binary_file_verification,$@)
 
   # Generation of any javah include file, make sure objects are dependent on it
   ifdef DEMO_NATIVECLASS
@@ -362,7 +368,7 @@
 	$(RM) -r $(DEMO_BUILD_AREA)
 	$(RM) -r $(DEMO_DESTDIR)
 
-# This should not be needed, but some versions of GNU amke have a bug that
+# This should not be needed, but some versions of GNU make have a bug that
 #   sometimes deleted these files  for some strange  and unknown reason 
 #   (GNU make version 3.78.1 has the problem, GNU make version 3.80 doesn't?)
 .PRECIOUS: $(DEMO_FULL_SOURCES) $(DEMO_BUILD_SRCZIP) $(DEMO_SOURCE_ZIP)
--- a/make/common/Library.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/common/Library.gmk	Sun Feb 20 12:46:58 2011 -0800
@@ -159,9 +159,6 @@
 # build it into $(OBJDIR) so that the other generated files get put 
 # there, then copy just the DLL (and MAP file) to the requested directory.
 #
-# In VS2005 or VS2008 the link command creates a .manifest file that we want
-# to insert into the linked artifact so we do not need to track it separately.
-# Use ";#2" for .dll and ";#1" for .exe in the MT command below:
 $(ACTUAL_LIBRARY):: $(OBJDIR)/$(LIBRARY).lcf
 	@$(prep-target)
 	@$(MKDIR) -p $(OBJDIR)
@@ -169,10 +166,8 @@
 	  -map:$(OBJDIR)/$(LIBRARY).map \
 	  $(LFLAGS) @$(OBJDIR)/$(LIBRARY).lcf \
 	  $(OTHER_LCF) $(JAVALIB) $(LDLIBS)
-ifdef MT
-	$(MT) /manifest $(OBJDIR)/$(@F).manifest /outputresource:$(OBJDIR)/$(@F);#2
-endif
 	$(CP) $(OBJDIR)/$(@F) $@
+	@$(call binary_file_verification,$@)
 	$(install-module-file)
 	$(CP) $(OBJDIR)/$(LIBRARY).map $(@D)
 	$(CP) $(OBJDIR)/$(LIBRARY).pdb $(@D)
@@ -239,6 +234,7 @@
 	$(AR) -r $@ $(FILES_o)
 else # LIBRARY
 	$(LINKER) $(SHARED_LIBRARY_FLAG) -o $@ $(FILES_o) $(LDLIBS)
+	@$(call binary_file_verification,$@)
 	$(install-module-file)
 ifeq ($(WRITE_LIBVERSION),true)
 	$(MCS) -d -a "$(FULL_VERSION)" $@
--- a/make/common/Modules.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/common/Modules.gmk	Sun Feb 20 12:46:58 2011 -0800
@@ -73,47 +73,20 @@
 
 #
 # Paths to these files we need
-JDK_MODULE_LICENSES   = $(LICENSE_DOCLIST_JDK:%=$(JDK_MODULE_IMAGE_DIR)/%)
-JDK_MODULE_64_LICENSES = $(LICENSE_DOCLIST_JDK:%=$(JDK_MODULE_IMAGE_DIR)/%64)
-JDK_MODULE_DOCFILES   = $(OTHER_DOCLIST_JDK:%=$(JDK_MODULE_IMAGE_DIR)/%)
-
-JRE_MODULE_LICENSES   = $(LICENSE_DOCLIST_JRE:%=$(JRE_MODULE_IMAGE_DIR)/%)
-JRE_MODULE_64_LICENSES = $(LICENSE_DOCLIST_JRE:%=$(JRE_MODULE_IMAGE_DIR)/%64)
-JRE_MODULE_DOCFILES   = $(OTHER_DOCLIST_JRE:%=$(JRE_MODULE_IMAGE_DIR)/%)
-JRE_MODULE_DOCFILES  += $(JRE_NAMECHANGE_DOCLIST:%=$(JRE_MODULE_IMAGE_DIR)/%$(TEXT_SUFFIX))
+JDK_MODULE_DOCFILES   = $(IMAGE_DOCLIST_JDK:%=$(JDK_MODULE_IMAGE_DIR)/%)
+JRE_MODULE_DOCFILES   = $(IMAGE_DOCLIST_JRE:%=$(JRE_MODULE_IMAGE_DIR)/%)
 
 ###### RULES
 
 # JDK files
 $(JDK_MODULE_IMAGE_DIR)/%: $(SHARE_JDK_DOC_SRC)/%
 	$(process-doc-file)
-# Removes LICENSE_VERSION or not
-ifdef LICENSE_VERSION
-$(JDK_MODULE_IMAGE_DIR)/%: $(SHARE_JDK_DOC_SRC)/%$(LICENSE_VERSION)
-	$(process-doc-file)
-$(JDK_MODULE_IMAGE_DIR)/%64: $(SHARE_JDK_DOC_SRC)/%$(LICENSE_VERSION)
-	$(process-doc-file)
-else
-$(JDK_MODULE_IMAGE_DIR)/%64: $(SHARE_JDK_DOC_SRC)/%
-	$(process-doc-file)
-endif
 
 # JRE files 
 $(JRE_MODULE_IMAGE_DIR)/%: $(SHARE_JRE_DOC_SRC)/%
 	$(process-doc-file)
-# Add $(TEXT_SUFFIX) suffix
-ifdef TEXT_SUFFIX
-$(JRE_MODULE_IMAGE_DIR)/%$(TEXT_SUFFIX): $(SHARE_JRE_DOC_SRC)/%
-	$(process-doc-file)
-endif
-# Removes LICENSE_VERSION or not
-ifdef LICENSE_VERSION
-$(JRE_MODULE_IMAGE_DIR)/%: $(SHARE_JRE_DOC_SRC)/%$(LICENSE_VERSION)
-	$(process-doc-file)
-$(JRE_MODULE_IMAGE_DIR)/%64: $(SHARE_JRE_DOC_SRC)/%$(LICENSE_VERSION)
-	$(process-doc-file)
-else
-$(JRE_MODULE_IMAGE_DIR)/%64: $(SHARE_JRE_DOC_SRC)/%
+ifeq ($(PLATFORM), windows)
+$(JRE_MODULE_IMAGE_DIR)/README.txt: $(SHARE_JRE_DOC_SRC)/README
 	$(process-doc-file)
 endif
 
@@ -157,8 +130,7 @@
 	$(MKDIR) -p $(JRE_MODULE_IMAGE_DIR)
 
 # 64-bit solaris jre image contains only the 64-bit add-on files.
-initial-module-image-jre-sol64:: initial-module-image-jre-setup \
-			  $(JRE_MODULE_LICENSES) $(JRE_MODULE_64_LICENSES)
+initial-module-image-jre-sol64:: initial-module-image-jre-setup
 	@# Use tar instead of cp to preserve the symbolic links
 	for dir in bin lib ; do \
 	  ( $(CD) $(OUTPUTDIR) && \
@@ -174,7 +146,7 @@
 
 # Construct an initial jre image (initial jdk jre) no trimming or stripping
 initial-module-image-jre:: initial-module-image-jre-setup \
-		    $(JRE_LICENSES) $(JRE_MODULE_DOCFILES) \
+		    $(JRE_MODULE_DOCFILES) \
 		    $(BUILDMETAINDEX_JARFILE)
 	@# Copy in bin directory
 	$(CD) $(OUTPUTDIR) && $(FIND) bin -depth | $(CPIO) -pdum $(JRE_MODULE_IMAGE_DIR)
@@ -222,7 +194,7 @@
 	@# Remove certain *.lib files
 	$(CD) $(JRE_MODULE_IMAGE_DIR)/lib && \
             $(RM) java.$(LIB_SUFFIX) jvm.$(LIB_SUFFIX) \
-                  hpi.$(LIB_SUFFIX) awt.$(LIB_SUFFIX) jawt.$(LIB_SUFFIX)
+                  awt.$(LIB_SUFFIX) jawt.$(LIB_SUFFIX)
   ifeq ($(ARCH_DATA_MODEL), 32)
 	@# The Java Kernel JRE image ships with a special VM.  It is not included
 	@# in the full JRE image, so remove it.  Also, is it only for 32-bit windows.
@@ -310,8 +282,7 @@
 
 # Solaris 64 bit image is special
 initial-module-image-jdk-sol64:: initial-module-image-jdk-setup \
-			  initial-module-image-jdk64-bindemos \
-			  $(JDK_MODULE_LICENSES) $(JDK_MODULARLIZED_64_LICENSES)
+			  initial-module-image-jdk64-bindemos
 
 # DB files to add
 ifeq ($(OPENJDK),true)
@@ -335,7 +306,7 @@
 # Standard jdk image
 initial-module-image-jdk:: initial-module-image-jdk-setup \
 		    initial-module-image-jdk-db \
-		    $(JDK_MODULE_LICENSES) $(JDK_MODULE_DOCFILES)
+		    $(JDK_MODULE_DOCFILES)
 	$(MKDIR) $(JDK_MODULE_IMAGE_DIR)/lib
 	@#
 	@# copy jdk modules to jdk/lib
@@ -415,8 +386,7 @@
 trim-module-image-jdk::
 	@# Remove tools that should not be part of SDK.
 	for t in $(NOTJDKTOOLS); do \
-	    $(RM) $(JDK_MODULE_IMAGE_DIR)/bin/$${t}$(EXE_SUFFIX) \
-		  $(JDK_MODULE_IMAGE_DIR)/bin/*/native_threads/$${t}$(EXE_SUFFIX); \
+	    $(RM) $(JDK_MODULE_IMAGE_DIR)/bin/$${t}$(EXE_SUFFIX); \
 	done
 
 # Get list of Elf files in the jdk
--- a/make/common/Program.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/common/Program.gmk	Sun Feb 20 12:46:58 2011 -0800
@@ -158,10 +158,15 @@
   STACK_SIZE=1048576
 endif
 
-# In VS2005 or VS2008 the link command creates a .manifest file that we want
-# to insert into the linked artifact so we do not need to track it separately.
+IMVERSION=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VER).$(COOKED_BUILD_NUMBER)
+$(OBJDIR)/$(PROGRAM).exe.manifest: $(JDK_TOPDIR)/src/windows/resource/java.manifest
+	@$(prep-target)
+	$(SED) 's%IMVERSION%$(IMVERSION)%g;s%PROGRAM%$(PROGRAM)%g' $< > $@
+
+# We used a hand-crafted manifest file for all executables.
+# It is tweaked to embed the build number and executable name.
 # Use ";#2" for .dll and ";#1" for .exe in the MT command below:
-$(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX):: $(OBJDIR)/$(PROGRAM).lcf $(FILES_o) $(JLI_LCF) 
+$(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX):: $(OBJDIR)/$(PROGRAM).lcf $(FILES_o) $(JLI_LCF) $(OBJDIR)/$(PROGRAM).exe.manifest
 	@$(prep-target)
 	@set -- $?; \
 	    $(ECHO) Rebuilding $@ because of $$1 $$2 $$3 $$4 $$5 $$6 $${7:+...};
@@ -171,6 +176,7 @@
 ifdef MT
 	$(MT) /manifest $(OBJDIR)/$(PROGRAM).exe.manifest /outputresource:$@;#1
 endif
+	@$(call binary_file_verification,$@)
 
 else # PLATFORM
 
@@ -199,6 +205,7 @@
 	@$(MKDIR) -p $(TEMPDIR)
 	$(LINK_PRE_CMD) $(CC) $(CC_OBJECT_OUTPUT_FLAG)$@ $(LDFLAGS) \
 	    $(FILES_o) $(THREADLIBS) $(LDLIBS)
+	@$(call binary_file_verification,$@)
 	$(install-module-file)
 
 endif # PLATFORM
--- a/make/common/Release.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/common/Release.gmk	Sun Feb 20 12:46:58 2011 -0800
@@ -26,6 +26,9 @@
 include $(JDK_TOPDIR)/make/docs/CORE_PKGS.gmk
 include $(JDK_TOPDIR)/make/docs/NON_CORE_PKGS.gmk
 
+# What jdk version are we building
+THIS_JDK_VERSION := $(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION)
+
 #
 # Perform release engineering tasks.
 #
@@ -72,14 +75,6 @@
 
 JTG_DOCS            = $(JDK_TOPDIR)/src/solaris/doc
 
-#We use this for man page header
-jdkversion := $(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION)
-
-# Text documents on windows use this suffix
-ifeq ($(PLATFORM), windows)
-  TEXT_SUFFIX = .txt
-endif
-
 # The base names of all the license and document files for the jdk and jre
 #   (These files get placed in the jdk and jre install images)
 ifdef OPENJDK
@@ -87,53 +82,28 @@
   SHARE_JDK_DOC_SRC = $(JDK_TOPDIR)
   SHARE_JRE_DOC_SRC = $(JDK_TOPDIR)
   # Same files for jdk and jre, no name changes
-  LICENSE_DOCLIST_JDK = LICENSE     ASSEMBLY_EXCEPTION
-  LICENSE_DOCLIST_JRE = LICENSE     ASSEMBLY_EXCEPTION
-  OTHER_DOCLIST_JDK   = THIRD_PARTY_README
-  OTHER_DOCLIST_JRE   = THIRD_PARTY_README
+  IMAGE_DOCLIST_JDK = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
+  IMAGE_DOCLIST_JRE = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
 else
   # Where to find these files
   SHARE_JDK_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jdk
   SHARE_JRE_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jre
-  # Select the pre-release or FCS license version based on the build milestone.
-  LICENSE_VERSION=.pre
-  ifeq ($(MILESTONE), fcs)
-    LICENSE_VERSION=.fcs
+  IMAGE_DOCLIST_JDK = COPYRIGHT README.html  THIRDPARTYLICENSEREADME.txt
+  IMAGE_DOCLIST_JRE = COPYRIGHT Welcome.html THIRDPARTYLICENSEREADME.txt
+  ifeq ($(PLATFORM), windows)
+    IMAGE_DOCLIST_JRE += README.txt
+  else
+    IMAGE_DOCLIST_JRE += README
   endif
-  ifeq ($(PLATFORM), windows)
-    LICENSE_DOCLIST_JDK = $(subst $(LICENSE_VERSION),,\
-		   $(shell $(CD) $(SHARE_JDK_DOC_SRC) && \
-		           $(LS) *LICENSE*$(LICENSE_VERSION)))
-    LICENSE_DOCLIST_JRE = $(subst $(LICENSE_VERSION),,\
-		   $(shell $(CD) $(SHARE_JRE_DOC_SRC) && \
-		           $(LS) *LICENSE*$(LICENSE_VERSION)))
-  else
-    LICENSE_DOCLIST_JDK = $(subst $(LICENSE_VERSION),,\
-	         $(shell $(CD) $(SHARE_JDK_DOC_SRC) && \
-		         $(LS) *LICENSE*$(LICENSE_VERSION) | $(GREP) -v rtf))
-    LICENSE_DOCLIST_JRE = $(subst $(LICENSE_VERSION),,\
-	         $(shell $(CD) $(SHARE_JRE_DOC_SRC) && \
-		         $(LS) *LICENSE*$(LICENSE_VERSION) | $(GREP) -v rtf))
-  endif
-  OTHER_DOCLIST_JDK = COPYRIGHT README.html README_ja.html README_zh_CN.html
-  OTHER_DOCLIST_JRE = COPYRIGHT Welcome.html
-  JRE_NAMECHANGE_DOCLIST = README
 endif
 
 # Paths to these files we need
-JDK_LICENSES   = $(LICENSE_DOCLIST_JDK:%=$(JDK_IMAGE_DIR)/%)
-JDK64_LICENSES = $(LICENSE_DOCLIST_JDK:%=$(JDK_IMAGE_DIR)/%64)
-JDK_DOCFILES   = $(OTHER_DOCLIST_JDK:%=$(JDK_IMAGE_DIR)/%)
-
-JRE_LICENSES   = $(LICENSE_DOCLIST_JRE:%=$(JRE_IMAGE_DIR)/%)
-JRE64_LICENSES = $(LICENSE_DOCLIST_JRE:%=$(JRE_IMAGE_DIR)/%64)
-JRE_DOCFILES   = $(OTHER_DOCLIST_JRE:%=$(JRE_IMAGE_DIR)/%)
-JRE_DOCFILES  += $(JRE_NAMECHANGE_DOCLIST:%=$(JRE_IMAGE_DIR)/%$(TEXT_SUFFIX))
+JDK_DOCFILES   = $(IMAGE_DOCLIST_JDK:%=$(JDK_IMAGE_DIR)/%)
+JRE_DOCFILES   = $(IMAGE_DOCLIST_JRE:%=$(JRE_IMAGE_DIR)/%)
 
 # absolute directory names: note, these must exist prior to build
 # time - they are created in the main Makefile.
 JRE_IMAGE_BINDIR   = $(JRE_IMAGE_DIR)/bin
-JRE_IMAGE_THREADIR = $(JRE_IMAGE_DIR)/bin/*/native_threads
 
 MAINMANIFEST  = $(JDK_TOPDIR)/make/tools/manifest.mf
 BEANMANIFEST  = $(JDK_TOPDIR)/make/javax/swing/beaninfo/manifest
@@ -218,7 +188,7 @@
         $(MKDIR) -p $1/man/$${ja_dir}/man1; \
         $(CAT) $${manbase}/ja/$${manpage} \
           | $(NATIVE2ASCII) -encoding $(JA_SOURCE_ENCODING) \
-          | $(SED) 's/@@VERSION@@/$(jdkversion)/g' \
+          | $(SED) 's/@@VERSION@@/$(THIS_JDK_VERSION)/g' \
           | $(NATIVE2ASCII) -reverse -encoding $${ja_encoding} \
             > $1/man/$${ja_dir}/man1/$${manpage}; \
       done; \
@@ -248,6 +218,7 @@
 initial-image-jre initial-image-jdk \
 initial-image-jre-sol64 initial-image-jdk-sol64 \
 trim-image-jre trim-image-jdk \
+identify-image-jre identify-image-jdk \
 process-image-jre process-image-jdk \
 compare-image \
 sec-files sec-files-win jgss-files ::
@@ -257,11 +228,12 @@
 images:: sanity-images post-sanity-images  \
 	 $(INITIAL_IMAGE_JRE) $(INITIAL_IMAGE_JDK) \
 	 trim-image-jre trim-image-jdk \
+         identify-image-jre identify-image-jdk \
 	 process-image-jre process-image-jdk sec-files sec-files-win jgss-files
 
 # Don't use these
-image-jre:: initial-image-jre trim-image-jre process-image-jre
-image-jdk:: initial-image-jdk trim-image-jdk process-image-jdk
+image-jre:: initial-image-jre trim-image-jre identify-image-jre process-image-jre
+image-jdk:: initial-image-jdk trim-image-jdk identify-image-jdk process-image-jdk
 
 #
 # Sources we ship in the SDK.
@@ -514,33 +486,12 @@
 # JDK files
 $(JDK_IMAGE_DIR)/%: $(SHARE_JDK_DOC_SRC)/%
 	$(process-doc-file)
-# Removes LICENSE_VERSION or not
-ifdef LICENSE_VERSION
-$(JDK_IMAGE_DIR)/%: $(SHARE_JDK_DOC_SRC)/%$(LICENSE_VERSION)
-	$(process-doc-file)
-$(JDK_IMAGE_DIR)/%64: $(SHARE_JDK_DOC_SRC)/%$(LICENSE_VERSION)
-	$(process-doc-file)
-else
-$(JDK_IMAGE_DIR)/%64: $(SHARE_JDK_DOC_SRC)/%
-	$(process-doc-file)
-endif
 
 # JRE files 
 $(JRE_IMAGE_DIR)/%: $(SHARE_JRE_DOC_SRC)/%
 	$(process-doc-file)
-# Add $(TEXT_SUFFIX) suffix
-ifdef TEXT_SUFFIX
-$(JRE_IMAGE_DIR)/%$(TEXT_SUFFIX): $(SHARE_JRE_DOC_SRC)/%
-	$(process-doc-file)
-endif
-# Removes LICENSE_VERSION or not
-ifdef LICENSE_VERSION
-$(JRE_IMAGE_DIR)/%: $(SHARE_JRE_DOC_SRC)/%$(LICENSE_VERSION)
-	$(process-doc-file)
-$(JRE_IMAGE_DIR)/%64: $(SHARE_JRE_DOC_SRC)/%$(LICENSE_VERSION)
-	$(process-doc-file)
-else
-$(JRE_IMAGE_DIR)/%64: $(SHARE_JRE_DOC_SRC)/%
+ifeq ($(PLATFORM), windows)
+$(JRE_IMAGE_DIR)/README.txt: $(SHARE_JRE_DOC_SRC)/README
 	$(process-doc-file)
 endif
 
@@ -748,8 +699,7 @@
 	$(MKDIR) -p $(JRE_IMAGE_DIR)
 
 # 64-bit solaris jre image contains only the 64-bit add-on files.
-initial-image-jre-sol64:: initial-image-jre-setup \
-			  $(JRE_LICENSES) $(JRE64_LICENSES)
+initial-image-jre-sol64:: initial-image-jre-setup
 	@# Use tar instead of cp to preserve the symbolic links
 	for dir in bin lib ; do \
 	  ( $(CD) $(OUTPUTDIR) && \
@@ -770,7 +720,7 @@
 # See "initial-image-jdk-setup" for an explanation of the rm of
 # drive names like C:
 initial-image-jre:: initial-image-jre-setup \
-		    $(JRE_LICENSES) $(JRE_DOCFILES) \
+		    $(JRE_DOCFILES) \
 		    $(RT_JAR) $(RESOURCES_JAR) $(JSSE_JAR) \
 		    $(BUILDMETAINDEX_JARFILE)
 	@# Copy in bin directory
@@ -812,7 +762,7 @@
 	@# Remove certain *.lib files
 	$(CD) $(JRE_IMAGE_DIR)/lib && \
             $(RM) java.$(LIB_SUFFIX) jvm.$(LIB_SUFFIX) \
-                  hpi.$(LIB_SUFFIX) awt.$(LIB_SUFFIX) jawt.$(LIB_SUFFIX)
+                  awt.$(LIB_SUFFIX) jawt.$(LIB_SUFFIX)
   ifeq ($(ARCH_DATA_MODEL), 32)
 	@# The Java Kernel JRE image ships with a special VM.  It is not included
 	@# in the full JRE image, so remove it.  Also, is it only for 32-bit windows.
@@ -846,11 +796,14 @@
   endif
 endif # PLATFORM
 
-# Get list of all Elf files in the jre
-JRE_ELF_LIST=$(TEMPDIR)/jre-elf-files.list
-$(JRE_ELF_LIST):
-ifneq ($(PLATFORM), windows)
+# Get list of all binary (COFF or Elf) files in the jre
+JRE_BIN_LIST=$(TEMPDIR)/jre-bin-files.list
+$(JRE_BIN_LIST):
 	$(RM) $@
+ifeq ($(PLATFORM), windows)
+	$(FIND) $(JRE_IMAGE_DIR)/bin -type f -name \*.exe \
+	   -o -name \*.dll | $(EGREP) -v -i "$(MSVCRNN_DLL)" > $@
+else
 	$(FIND) $(JRE_IMAGE_DIR)/lib -type f -name \*.$(LIB_SUFFIX) >> $@
 	$(FILE) `$(FIND) $(JRE_IMAGE_DIR)/bin -type f -name \*$(EXE_SUFFIX)` \
 	    | $(EGREP) 'ELF' | $(CUT) -d':' -f1 >> $@
@@ -858,9 +811,9 @@
 
 # Post process the image (strips and mcs on Elf files we are shipping)
 #   (Note the jdk WILL want the jre image before this processing)
-process-image-jre:: $(JRE_ELF_LIST)
+process-image-jre:: $(JRE_BIN_LIST)
 ifneq ($(POST_STRIP_PROCESS), )
-	for f in `$(CAT) $(JRE_ELF_LIST)`; do \
+	@for f in `$(CAT) $(JRE_BIN_LIST)`; do \
 	  $(CHMOD) u+w $${f}; \
 	  $(ECHO) $(POST_STRIP_PROCESS) $${f}; \
 	  $(POST_STRIP_PROCESS) $${f}; \
@@ -868,14 +821,17 @@
 	done
 endif
 ifneq ($(POST_MCS_PROCESS), )
-	for f in `$(CAT) $(JRE_ELF_LIST)`; do \
+	@for f in `$(CAT) $(JRE_BIN_LIST)`; do \
 	  $(CHMOD) u+w $${f}; \
 	  $(ECHO) $(POST_MCS_PROCESS) $${f}; \
 	  $(POST_MCS_PROCESS) $${f}; \
 	  $(CHMOD) go-w $${f}; \
 	done
 endif
-	$(RM) $(JRE_ELF_LIST)
+	@for f in `$(CAT) $(JRE_BIN_LIST)`; do \
+	  $(call binary_file_verification,$${f}); \
+	done
+	$(RM) $(JRE_BIN_LIST)
 
 ######################################################
 # JDK Image
@@ -915,8 +871,7 @@
 
 # Solaris 64 bit image is special
 initial-image-jdk-sol64:: initial-image-jdk-setup \
-			  initial-image-jdk64-bindemos \
-			  $(JDK_LICENSES) $(JDK64_LICENSES)
+			  initial-image-jdk64-bindemos
 
 # DB files to add
 ifdef OPENJDK
@@ -940,7 +895,7 @@
 # Standard jdk image
 initial-image-jdk:: initial-image-jdk-setup \
 		    initial-image-jdk-db \
-		    $(JDK_LICENSES) $(JDK_DOCFILES)
+		    $(JDK_DOCFILES)
 	$(MKDIR) $(JDK_IMAGE_DIR)/lib
 	@#
 	@# Copy in the jars in lib that only belong in the JDK
@@ -1099,14 +1054,18 @@
 trim-image-jdk::
 	@# Remove tools that should not be part of SDK.
 	for t in $(NOTJDKTOOLS); do \
-	    $(RM) $(JDK_IMAGE_DIR)/bin/$${t}$(EXE_SUFFIX) \
-		  $(JDK_IMAGE_DIR)/bin/*/native_threads/$${t}$(EXE_SUFFIX); \
+	    $(RM) $(JDK_IMAGE_DIR)/bin/$${t}$(EXE_SUFFIX); \
 	done
 
-# Get list of Elf files in the jdk
-JDK_ELF_LIST=$(TEMPDIR)/jdk-elf-files.list
-$(JDK_ELF_LIST):
-ifneq ($(PLATFORM), windows)
+# Get list of binary (COFF or Elf) files in the jdk
+JDK_BIN_LIST=$(TEMPDIR)/jdk-bin-files.list
+$(JDK_BIN_LIST):
+ifeq ($(PLATFORM), windows)
+	$(FIND) $(JDK_IMAGE_DIR)/jre/bin -type f -name \*.exe \
+	   -o -name \*.dll | $(EGREP) -v -i "$(MSVCRNN_DLL)" > $@
+	$(FIND) $(JDK_IMAGE_DIR)/bin -type f -name \*.exe \
+	   -o -name \*.dll | $(EGREP) -v -i "$(MSVCRNN_DLL)" >> $@
+else
 	$(RM) $@
 	$(FIND) $(JDK_IMAGE_DIR)/jre/lib -type f -name \*.$(LIB_SUFFIX) >> $@
 	$(FILE) `$(FIND) $(JDK_IMAGE_DIR)/jre/bin -type f -name \*$(EXE_SUFFIX)` \
@@ -1116,9 +1075,9 @@
 endif
 
 # Post process the image (strips and mcs on files we are shipping)
-process-image-jdk:: $(JDK_ELF_LIST)
+process-image-jdk:: $(JDK_BIN_LIST)
 ifneq ($(POST_STRIP_PROCESS), )
-	for f in `$(CAT) $(JDK_ELF_LIST)`; do \
+	@for f in `$(CAT) $(JDK_BIN_LIST)`; do \
 	  $(CHMOD) u+w $${f}; \
 	  $(ECHO) $(POST_STRIP_PROCESS) $${f}; \
 	  $(POST_STRIP_PROCESS) $${f}; \
@@ -1126,14 +1085,56 @@
 	done
 endif
 ifneq ($(POST_MCS_PROCESS), )
-	for f in `$(CAT) $(JDK_ELF_LIST)`; do \
+	@for f in `$(CAT) $(JDK_BIN_LIST)`; do \
 	  $(CHMOD) u+w $${f}; \
 	  $(ECHO) $(POST_MCS_PROCESS) $${f}; \
 	  $(POST_MCS_PROCESS) $${f}; \
 	  $(CHMOD) go-w $${f}; \
 	done
 endif
-	$(RM) $(JDK_ELF_LIST)
+	@for f in `$(CAT) $(JDK_BIN_LIST)`; do \
+	  $(call binary_file_verification,$${f}); \
+	done
+	$(RM) $(JDK_BIN_LIST)
+
+###################################################################
+# What did we build
+###################################################################
+
+# The jdk text info file that lives at the root of the install image.
+
+JDK_INFO_FILE = $(JDK_IMAGE_DIR)/release
+JRE_INFO_FILE = $(JRE_IMAGE_DIR)/release
+
+# Common way to emit a line into the release or info file
+define info-file-item # name value
+$(PRINTF) "%s=\"%s\"\n" $1 $2 >> $@
+endef
+
+# Values to emit
+MINIMUM_OS_NAME    := $(REQUIRED_OS_NAME)
+MINIMUM_OS_VERSION := $(REQUIRED_OS_VERSION)
+MINIMUM_OS_ARCH    := $(ARCH)
+
+$(JDK_INFO_FILE): FRC
+	$(prep-target)
+	$(call info-file-item, "JAVA_VERSION", "$(THIS_JDK_VERSION)")
+	$(call info-file-item, "OS_NAME",      "$(MINIMUM_OS_NAME)")
+	$(call info-file-item, "OS_VERSION",   "$(MINIMUM_OS_VERSION)")
+	$(call info-file-item, "OS_ARCH",      "$(MINIMUM_OS_ARCH)")
+
+# Create release file to identify this image
+identify-image-jdk:: $(JDK_INFO_FILE)
+
+$(JRE_INFO_FILE): FRC
+	$(prep-target)
+	$(call info-file-item, "JAVA_VERSION", "$(THIS_JDK_VERSION)")
+	$(call info-file-item, "OS_NAME",      "$(MINIMUM_OS_NAME)")
+	$(call info-file-item, "OS_VERSION",   "$(MINIMUM_OS_VERSION)")
+	$(call info-file-item, "OS_ARCH",      "$(MINIMUM_OS_ARCH)")
+
+# Create release file to identify this image
+identify-image-jre:: $(JRE_INFO_FILE)
 
 ###################################################################
 # What do we compare against
@@ -1288,6 +1289,7 @@
         initial-image-jre-setup \
 	trim-image-jre trim-image-jdk \
 	process-image-jre process-image-jdk \
+	identify-image-jre identify-image-jdk \
 	install-previous-jre install-previous-jdk \
 	compare-image-jre compare-image-jdk \
 	compare-image compare-image-clobber \
--- a/make/common/shared/Compiler-msvc.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/common/shared/Compiler-msvc.gmk	Sun Feb 20 12:46:58 2011 -0800
@@ -35,6 +35,7 @@
   LIBEXE       = $(COMPILER_PATH)lib
   LINK         = $(COMPILER_PATH)link
   LINK32       = $(LINK)
+  DUMPBIN      = $(COMPILER_PATH)dumpbin.exe
  
   # Fill in unknown values
   COMPILER_NAME=Unknown MSVC Compiler
@@ -139,8 +140,8 @@
         _OTHER_TOOLS_BIN = $(WINDOWSSDKDIR)/Bin/x64
       endif
     endif
-    RC     = $(_OTHER_TOOLS_BIN)/rc.exe
-    REBASE = $(_OTHER_TOOLS_BIN)/rebase.exe
+    RC     = $(_OTHER_TOOLS_BIN)/RC.Exe
+    REBASE = $(_OTHER_TOOLS_BIN)/ReBase.Exe
     MT     = $(_OTHER_TOOLS_BIN)/mt.exe
     MTL    = $(_OTHER_TOOLS_BIN)/midl.exe
   endif
--- a/make/common/shared/Defs-control.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/common/shared/Defs-control.gmk	Sun Feb 20 12:46:58 2011 -0800
@@ -76,12 +76,9 @@
 ABS_SRC_BUNDLEDIR   = $(ABS_OUTPUTDIR)/source-bundles
 BIN_BUNDLEDIR       = $(OUTPUTDIR)/bundles
 ABS_BIN_BUNDLEDIR   = $(ABS_OUTPUTDIR)/bundles
-JRL_BUNDLEDIR       = $(OUTPUTDIR)/java.net
-ABS_JRL_BUNDLEDIR   = $(ABS_OUTPUTDIR)/java.net
 
 dummy := $(shell $(MKDIR) -p $(BIN_BUNDLEDIR))
 dummy := $(shell $(MKDIR) -p $(SRC_BUNDLEDIR) )
-dummy := $(shell $(MKDIR) -p $(JRL_BUNDLEDIR) )
 
 TEMP_DIR = $(OUTPUTDIR)/tmp
 ABS_TEMP_DIR = $(ABS_OUTPUTDIR)/tmp
--- a/make/common/shared/Defs-linux.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/common/shared/Defs-linux.gmk	Sun Feb 20 12:46:58 2011 -0800
@@ -177,3 +177,20 @@
 endif
 HOTSPOT_SERVER_PATH:=$(call AltCheckValue,HOTSPOT_SERVER_PATH)
 
+# Special define for checking the binaries
+
+# Macro to check it's input file for banned dependencies and verify the
+#   binary built properly. Relies on process exit code.
+define binary_file_verification # binary_file
+( \
+  $(ECHO) "Checking for mapfile use in: $1" && \
+  if [ "`$(NM) -D -g --defined-only $1 | $(EGREP) 'SUNWprivate'`" = "" ] ; then \
+    $(ECHO) "WARNING: File was not built with a mapfile: $1"; \
+  fi && \
+  $(ECHO) "Library loads for: $1" && \
+  $(LDD) $1 && \
+  $(ECHO) "RUNPATH for: $1" && \
+  ( $(READELF) -d $1 | $(EGREP) 'NEEDED|RUNPATH|RPATH' ) \
+)
+endef
+
--- a/make/common/shared/Defs-solaris.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/common/shared/Defs-solaris.gmk	Sun Feb 20 12:46:58 2011 -0800
@@ -186,3 +186,20 @@
 endif
 HOTSPOT_SERVER_PATH:=$(call AltCheckValue,HOTSPOT_SERVER_PATH)
 
+# Special define for checking the binaries
+
+# Macro to check it's input file for banned dependencies and verify the
+#   binary built properly. Relies on process exit code.
+define binary_file_verification # binary_file
+( \
+  $(ECHO) "Checking for mapfile use in: $1" && \
+  if [ "`$(NM) -g -D $1 | $(EGREP) -v 'UNDEF' | $(EGREP) 'SUNWprivate'`" = "" ] ; then \
+    $(ECHO) "WARNING: File was not built with a mapfile: $1"; \
+  fi && \
+  $(ECHO) "Library loads for: $1" && \
+  $(LDD) $1 && \
+  $(ECHO) "RUNPATH for: $1" && \
+  ( $(DUMP) -L -v $1 | $(EGREP) 'NEEDED|RUNPATH|RPATH' ) \
+)
+endef
+
--- a/make/common/shared/Defs-utils.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/common/shared/Defs-utils.gmk	Sun Feb 20 12:46:58 2011 -0800
@@ -92,6 +92,7 @@
 DF             = $(UTILS_COMMAND_PATH)df
 DIFF           = $(UTILS_USR_BIN_PATH)diff
 DIRNAME        = $(UTILS_USR_BIN_PATH)dirname
+DUMP           = $(UTILS_CCS_BIN_PATH)dump
 ECHO           = $(UTILS_COMMAND_PATH)echo
 EGREP          = $(UTILS_COMMAND_PATH)egrep
 EXPR           = $(UTILS_USR_BIN_PATH)expr
@@ -106,6 +107,7 @@
 ISAINFO        = $(UTILS_COMMAND_PATH)isainfo
 KSH            = $(UTILS_COMMAND_PATH)ksh
 LD             = $(UTILS_CCS_BIN_PATH)ld
+LDD            = $(UTILS_USR_BIN_PATH)ldd
 LEX            = $(UTILS_CCS_BIN_PATH)lex
 LN             = $(UTILS_COMMAND_PATH)ln
 LS             = $(UTILS_COMMAND_PATH)ls
@@ -121,6 +123,7 @@
 PRINTF         = $(UTILS_USR_BIN_PATH)printf
 PWD            = $(UTILS_COMMAND_PATH)pwd
 RC             = $(UTILS_COMMAND_PATH)rc
+READELF        = $(UTILS_USR_BIN_PATH)readelf
 RMDIR          = $(UTILS_COMMAND_PATH)rmdir
 RPM            = $(UTILS_COMMAND_PATH)rpm
 RPMBUILD       = $(UTILS_COMMAND_PATH)rpmbuild
--- a/make/common/shared/Defs-versions.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/common/shared/Defs-versions.gmk	Sun Feb 20 12:46:58 2011 -0800
@@ -132,6 +132,7 @@
 
 # Solaris specific
 ifeq ($(PLATFORM), solaris)
+  REQUIRED_OS_NAME            = SunOS
   REQUIRED_OS_VERSION         = 5.10
   REQUIRED_OS_VARIANT_NAME    = Solaris
   REQUIRED_OS_VARIANT_VERSION = $(REQUIRED_OS_VERSION)
@@ -153,6 +154,7 @@
 
 # Linux specific
 ifeq ($(PLATFORM), linux)
+  REQUIRED_OS_NAME            = Linux
   REQUIRED_OS_VERSION         = 2.6
   REQUIRED_OS_VARIANT_NAME    = Fedora
   REQUIRED_OS_VARIANT_VERSION = 9
@@ -171,6 +173,7 @@
 
 # Windows specific
 ifeq ($(PLATFORM), windows)
+  REQUIRED_OS_NAME            = Windows
   ifeq ($(ARCH_DATA_MODEL),64)
     REQUIRED_OS_VERSION       = 5.2
     REQUIRED_OS_VARIANT_NAME  = Windows2003
@@ -210,7 +213,7 @@
 endif
 
 # Generic
-REQUIRED_ANT_VER          = 1.6.3
+REQUIRED_ANT_VER          = 1.7.1
 REQUIRED_BOOT_VER         = 1.6
 REQUIRED_FREETYPE_VERSION = 2.3.0
 REQUIRED_MAKE_VER         = 3.81
--- a/make/common/shared/Defs-windows.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/common/shared/Defs-windows.gmk	Sun Feb 20 12:46:58 2011 -0800
@@ -86,17 +86,25 @@
 #
 
 ifdef USING_CYGWIN
+# Macro to effectively do a toupper without an exec
+define ToUpper
+$(subst a,A,$(subst b,B,$(subst c,C,$(subst d,D,$(subst e,E,$(subst f,F,\
+$(subst g,G,$(subst h,H,$(subst i,I,$(subst j,J,$(subst k,K,$(subst l,L,\
+$(subst m,M,$(subst n,N,$(subst o,O,$(subst p,P,$(subst q,Q,$(subst r,R,\
+$(subst s,S,$(subst t,T,$(subst u,U,$(subst v,V,$(subst w,W,$(subst x,X,\
+$(subst y,Y,$(subst z,Z,$1))))))))))))))))))))))))))
+endef
 # All possible drive letters
 drives=a b c d e f g h i j k l m n o p q r s t v u w x y z
 # Convert /cygdrive/ paths to the mixed style without an exec of cygpath
-#   Must be a path with no spaces.
+#   Must be a path with no spaces. /cygdrive/letter is always lowercase
+#   and letter:/ is always uppercase coming from cygpath.
 define MixedPath
-$(patsubst /%,c:/cygwin/%,$(sort $(filter-out /cygdrive/%,$(foreach drive,$(drives),$(patsubst /cygdrive/$(drive)/%,$(drive):/%,$1)))))
+$(patsubst /%,$(CYGWIN_HOME)/%,$(sort $(filter-out /cygdrive/%,$(foreach drive,$(drives),$(patsubst /cygdrive/$(drive)/%,$(call ToUpper,$(drive)):/%,$1)))))
 endef
 # Use FullPath to get C:/ style non-spaces path. Never ends with a /!
 # We assume cygpath is available in the search path
 #    NOTE: Use of 'pwd' with CYGWIN will not get you a mixed style path!
-CYGPATH_CMD=cygpath -a -s -m
 define FullPath
 $(if $(word 2,$1),$(shell $(CYGPATH_CMD) $1 2> $(DEV_NULL)),$(call MixedPath,$(realpath $(subst ",,$1))))
 endef
@@ -125,10 +133,15 @@
 
 # UNIXCOMMAND_PATH: path to where the most common Unix commands are.
 #  NOTE: Must end with / so that it could be empty, allowing PATH usage.
+#        With cygwin, just use this as is don't use FullPath on it.
 ifdef ALT_UNIXCOMMAND_PATH
-  xALT_UNIXCOMMAND_PATH  :="$(subst \,/,$(ALT_UNIXCOMMAND_PATH))"
-  fxALT_UNIXCOMMAND_PATH :=$(call FullPath,$(xALT_UNIXCOMMAND_PATH))
-  UNIXCOMMAND_PATH       :=$(call PrefixPath,$(fxALT_UNIXCOMMAND_PATH))
+  ifdef USING_CYGWIN
+    UNIXCOMMAND_PATH       :=$(call PrefixPath,$(ALT_UNIXCOMMAND_PATH))
+  else
+    xALT_UNIXCOMMAND_PATH  :="$(subst \,/,$(ALT_UNIXCOMMAND_PATH))"
+    fxALT_UNIXCOMMAND_PATH :=$(call FullPath,$(xALT_UNIXCOMMAND_PATH))
+    UNIXCOMMAND_PATH       :=$(call PrefixPath,$(fxALT_UNIXCOMMAND_PATH))
+  endif
 else
   ifdef USING_CYGWIN
     UNIXCOMMAND_PATH :=$(call PrefixPath,/usr/bin)
@@ -288,8 +301,8 @@
     xVS100COMNTOOLS :="$(_program_files32)/Microsoft Visual Studio 10.0/Common7/Tools/"
     fVS100COMNTOOLS :=$(call FullPath,$(xVS100COMNTOOLS))
   else
+    xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))"
     ifneq ($(word 2,$(VS100COMNTOOLS)),)
-      xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))"
       fVS100COMNTOOLS :=$(call FullPath,$(xVS100COMNTOOLS))
     else
       fVS100COMNTOOLS :=$(xVS100COMNTOOLS)
@@ -459,9 +472,11 @@
 endif
 
 # SLASH_JAVA: location of all network accessable files
+# NOTE: Do not use FullPath on this because it's often a drive letter and
+#       plain drive letters are ambiguous, so just use this 'as is'.
 ifdef ALT_SLASH_JAVA
   xALT_SLASH_JAVA :="$(subst \,/,$(ALT_SLASH_JAVA))"
-  SLASH_JAVA      :=$(call FullPath,$(xALT_SLASH_JAVA))
+  SLASH_JAVA      :=$(xALT_SLASH_JAVA)
 else
   ifdef ALT_JDK_JAVA_DRIVE
     SLASH_JAVA  =$(JDK_JAVA_DRIVE)
@@ -551,18 +566,6 @@
   _BOOTDIR3  =$(SLASH_JAVA)/re/jdk/$(PREVIOUS_JDK_VERSION)/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
 endif
 
-# 32 bit always needs 2 runtimes, 64 bit usually does too
-
-# MSVCRT_DLL_PATH: location of msvcrt.dll that will be re-distributed
-ifdef ALT_MSVCRT_DLL_PATH
-  xALT_MSVCRT_DLL_PATH :="$(subst \,/,$(ALT_MSVCRT_DLL_PATH))"
-  MSVCRT_DLL_PATH      :=$(call FullPath,$(xALT_MSVCRT_DLL_PATH))
-else
-  MSVCRT_DLL_PATH :=$(call FullPath,$(_system_root)/system32/)
-endif
-MSVCRT_DLL_PATH:=$(call AltCheckSpaces,MSVCRT_DLL_PATH)
-MSVCRT_DLL_PATH:=$(call AltCheckValue,MSVCRT_DLL_PATH)
-
 # 32bit always needs the MSVCRNN runtime, 64bit does when using VS2008
 ifeq ($(ARCH_DATA_MODEL), 32)
   _NEEDS_MSVCRNN = true
@@ -641,15 +644,6 @@
 endif
 INSTALL_MSSDK:=$(call AltCheckSpaces,INSTALL_MSSDK)
 
-# INSTALL_MSIVAL2: Installation of MsiVal2 for this platform (for install)
-ifdef ALT_INSTALL_MSIVAL2
-  xALT_INSTALL_MSIVAL2 :="$(subst \,/,$(ALT_INSTALL_MSIVAL2))"
-  INSTALL_MSIVAL2      :=$(call FullPath,$(xALT_INSTALL_MSIVAL2))
-else
-  INSTALL_MSIVAL2      :=$(_program_files32)/MsiVal2
-endif
-INSTALL_MSIVAL2:=$(call AltCheckSpaces,INSTALL_MSIVAL2)
-
 # WSCRIPT: path to wscript.exe (used in creating install bundles)
 ifdef ALT_WSCRIPT
   xALT_WSCRIPT :="$(subst \,/,$(ALT_WSCRIPT))"
@@ -685,43 +679,6 @@
 endif
 CABARC:=$(call AltCheckSpaces,CABARC)
 
-# MSIVAL2: path to msival2.exe (used in validating install msi files)
-ifdef ALT_MSIVAL2
-  xALT_MSIVAL2 :="$(subst \,/,$(ALT_MSIVAL2))"
-  MSIVAL2  =$(xALT_MSIVAL2)
-else
-  _MSIVAL2_1 :=$(INSTALL_MSIVAL2)/msival2.exe
-  _MSIVAL2_2 :=$(DEVTOOLS_PATH)msival2.exe
-  MSIVAL2    :=$(call FileExists,$(_MSIVAL2_1),$(_MSIVAL2_2))
-endif
-MSIVAL2:=$(call AltCheckSpaces,MSIVAL2)
-# suppress msival2 checks, as it hangs jprt builds
-ifdef SKIP_MSIVAL2
-  MSIVAL2    := $(ECHO)
-endif
-
-# LOGOCUB: path to cub file for (used in validating install msi files)
-ifdef ALT_LOGOCUB
-  xALT_LOGOCUB :="$(subst \,/,$(ALT_LOGOCUB))"
-  LOGOCUB  =$(xALT_LOGOCUB)
-else
-  _LOGOCUB1 :=$(INSTALL_MSIVAL2)/logo.cub
-  _LOGOCUB2 :=$(DEVTOOLS_PATH)logo.cub
-  LOGOCUB   :=$(call FileExists,$(_LOGOCUB1),$(_LOGOCUB2))
-endif
-LOGOCUB:=$(call AltCheckSpaces,LOGOCUB)
-
-# MSITRAN: path to msitran.exe (used in creating install bundles and sponsors)
-ifdef ALT_MSITRAN
-  xALT_MSITRAN :="$(subst \,/,$(ALT_MSITRAN))"
-  MSITRAN  =$(xALT_MSITRAN)
-else
-  _MSITRAN1 :=$(INSTALL_MSSDK)/Bin/msitran.exe
-  _MSITRAN2 :=$(DEVTOOLS_PATH)msitran.exe
-  MSITRAN   :=$(call FileExists,$(_MSITRAN1),$(_MSITRAN2))
-endif
-MSITRAN:=$(call AltCheckSpaces,MSITRAN)
-
 # MSICERT: path to msicert.exe (used in creating install bundles)
 ifdef ALT_MSICERT
   xALT_MSICERT :="$(subst \,/,$(ALT_MSICERT))"
@@ -798,3 +755,54 @@
 endif
 HOTSPOT_LIB_PATH:=$(call AltCheckSpaces,HOTSPOT_LIB_PATH)
 HOTSPOT_LIB_PATH:=$(call AltCheckValue,HOTSPOT_LIB_PATH)
+
+# Special define for checking the binaries
+
+ifeq ($(VS2010_EXISTS),true)
+
+# All windows dll and exe files should have been built with /NXCOMPAT
+#   and be setup for dynamic base addresses.
+#   In addition, we should not be dependent on certain dll files that
+#   we do not or cannot redistribute.
+
+# List of filenames we should NOT be dependent on
+ifeq ($(MFC_DEBUG),true)
+  BANNED_DLLS=msvcp100[.]dll
+else
+  BANNED_DLLS=msvcp100[.]dll|msvcr100d[.]dll|msvcrtd[.]dll
+endif
+
+# Macro to check it's input file for banned dependencies and verify the
+#   binary was built properly. Relies on process exit code.
+define binary_file_verification # binary_file
+( \
+  $(ECHO) "Checking for /NXCOMPAT usage in: $1" && \
+  if [ "`$(DUMPBIN) /headers $1 | $(EGREP) -i 'NX compatible'`" = "" ] ; then \
+    $(ECHO) "ERROR: Did not find 'NX compatible' in headers: $1" ; \
+    $(DUMPBIN) /headers $1 ; \
+    exit 7 ; \
+  fi ; \
+  $(ECHO) "Checking for /DYNAMICBASE usage in: $1" && \
+  if [ "`$(DUMPBIN) /headers $1 | $(EGREP) -i 'Dynamic base'`" = "" ] ; then \
+    $(ECHO) "ERROR: Did not find 'Dynamic base' in headers: $1" ; \
+    $(DUMPBIN) /headers $1 ; \
+    exit 8 ; \
+  fi ; \
+  $(ECHO) "Checking for banned dependencies in: $1" && \
+  if [ "`$(DUMPBIN) /dependents $1 | $(EGREP) -i '$(BANNED_DLLS)'`" != "" ] ; then \
+    $(ECHO) "ERROR: Found use of $(BANNED_DLLS)"; \
+    $(DUMPBIN) /dependents $1 ; \
+    exit 9 ; \
+  fi ; \
+)
+endef
+
+else
+
+# Macro to check it's input file for banned dependencies and verify the
+#   binary was built properly. Relies on process exit code.
+define binary_file_verification # binary_file
+endef
+
+endif
+
--- a/make/common/shared/Defs.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/common/shared/Defs.gmk	Sun Feb 20 12:46:58 2011 -0800
@@ -54,11 +54,12 @@
 # Assumes ARCH, PLATFORM, ARCH_VM_SUBDIR, JDK_TOPDIR, etc. have been defined.
 
 # Simple pwd path
+# NOTE: Just use the shell's cd and pwd here, more reliable at sanity time.
 define PwdPath
-$(shell $(CD) $1 2> $(DEV_NULL) && $(PWD))
+$(shell cd $1 2> $(DEV_NULL) && pwd)
 endef
 define AbsPwdPathCheck
-$(shell $(CD) .. 2> $(DEV_NULL) && $(CD) $1 2> $(DEV_NULL) && $(PWD))
+$(shell cd .. 2> $(DEV_NULL) && cd $1 2> $(DEV_NULL) && pwd)
 endef
 
 # Checks an ALT value for spaces (should be one word), 
--- a/make/common/shared/Platform.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/common/shared/Platform.gmk	Sun Feb 20 12:46:58 2011 -0800
@@ -72,7 +72,11 @@
 #     USING_CYGWIN                windows only: true or false
 #     ISHIELD_TEMP_MIN            windows only: minimum disk space in temp area
 
-SYSTEM_UNAME := $(shell uname)
+# Only run uname once in this make session.
+ifndef SYSTEM_UNAME
+  SYSTEM_UNAME := $(shell uname)
+  export SYSTEM_UNAME
+endif
 
 #
 # Prune out all known SCM (Source Code Management) directories
@@ -317,6 +321,12 @@
   PLATFORM = windows
   USING_CYGWIN = true
   export USING_CYGWIN
+  CYGPATH_CMD=cygpath -a -s -m
+  # Only run "cygpath /" once in this make session.
+  ifndef CYGWIN_HOME
+    CYGWIN_HOME := $(shell $(CYGPATH_CMD) /)
+    export CYGWIN_HOME
+  endif
 endif
 
 # Platform settings specific to Windows
@@ -330,7 +340,12 @@
   #  And sometimes PROCESSOR_IDENTIFIER is not defined at all
   #  (in some restricted shells), so we use uname if we have to.
   ifeq ($(PROCESSOR_IDENTIFIER),)
-    PROC_ARCH:=$(shell uname -m)
+    # Only run uname -m once in this make session.
+    ifndef SYSTEM_UNAME_M
+      SYSTEM_UNAME_M := $(shell uname -m)
+      export SYSTEM_UNAME_M
+    endif
+    PROC_ARCH:=$(SYSTEM_UNAME_M)
   else
     PROC_ARCH:=$(word 1, $(PROCESSOR_IDENTIFIER))
   endif
--- a/make/common/shared/Sanity-Settings.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/common/shared/Sanity-Settings.gmk	Sun Feb 20 12:46:58 2011 -0800
@@ -96,7 +96,6 @@
   endif
 endif
 ifeq ($(PLATFORM),windows)
-  ALL_SETTINGS+=$(call addAltSetting,MSVCRT_DLL_PATH)
   ifneq ($(MSVCRNN_DLL),)
     ALL_SETTINGS+=$(call addAltSetting,MSVCRNN_DLL_PATH)
   endif
@@ -117,6 +116,9 @@
 ALL_SETTINGS+=$(call addRequiredVersionSetting,UNZIP_VER)
 ifeq ($(PLATFORM),windows)
   ALL_SETTINGS+=$(call addRequiredVersionSetting,LINK_VER)
+  ALL_SETTINGS+=$(call addRequiredSetting,CC)
+  ALL_SETTINGS+=$(call addRequiredSetting,LINK)
+  ALL_SETTINGS+=$(call addRequiredSetting,DUMPBIN)
 endif
 ALL_SETTINGS+=$(call addRequiredVersionSetting,ANT_VER)
 ALL_SETTINGS+=$(call addRequiredSetting,TEMPDIR)
@@ -226,13 +228,13 @@
   ALL_SETTINGS+=$(call addAltSetting,DXSDK_INCLUDE_PATH)
   ALL_SETTINGS+=$(call addAltSetting,DXSDK_LIB_PATH)
   ALL_SETTINGS+=$(call addAltSetting,WINDOWSSDKDIR)
+  ALL_SETTINGS+=$(call addRequiredSetting,RC)
+  ALL_SETTINGS+=$(call addRequiredSetting,REBASE)
   ifndef OPENJDK
     ALL_SETTINGS+=$(call addAltSetting,DEPLOY_MSSDK)
     ALL_SETTINGS+=$(call addAltSetting,INSTALL_MSSDK)
     ALL_SETTINGS+=$(call addAltSetting,WSCRIPT)
     ALL_SETTINGS+=$(call addAltSetting,MSICERT)
-    ALL_SETTINGS+=$(call addAltSetting,MSITRAN)
-    ALL_SETTINGS+=$(call addAltSetting,MSIVAL2)
   endif
 endif
 ALL_SETTINGS+=$(call addAltSetting,CACERTS_FILE)
--- a/make/common/shared/Sanity.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/common/shared/Sanity.gmk	Sun Feb 20 12:46:58 2011 -0800
@@ -260,10 +260,10 @@
 MAKE_CHECK :=$(call CheckVersions,$(MAKE_VER),$(REQUIRED_MAKE_VER))
 sane-make:
 	@if [ "$(MAKE_CHECK)" != "same" -a "$(MAKE_CHECK)" != "newer" ]; then \
-	  $(ECHO) "WARNING: The version of make being used is older than \n" \
+	  $(ECHO) "ERROR: The version of make being used is older than \n" \
 	    "      the required version of '$(REQUIRED_MAKE_VER)'. \n" \
 	    "      The version of make found was '$(MAKE_VER)'. \n" \
-	    "" >> $(WARNING_FILE) ; \
+	    "" >> $(ERROR_FILE) ; \
 	fi
 
 ######################################################
@@ -887,13 +887,6 @@
 ######################################################
 sane-msvcrt_path:
 ifeq ($(PLATFORM), windows)
-	@if [ ! -r "$(MSVCRT_DLL_PATH)/msvcrt.dll" ]; then \
-	  $(ECHO) "ERROR: You do not have access to msvcrt.dll. \n" \
-	    "      Please check your access to \n" \
-	    "          $(MSVCRT_DLL_PATH) \n" \
-	    "      and/or check your value of ALT_MSVCRT_DLL_PATH. \n" \
-	    "" >> $(ERROR_FILE) ; \
-	fi
   ifneq ($(MSVCRNN_DLL),)
 	@if [ ! -r "$(MSVCRNN_DLL_PATH)/$(MSVCRNN_DLL)" ]; then \
 	  $(ECHO) "ERROR: You do not have access to $(MSVCRNN_DLL). \n" \
@@ -1026,6 +1019,22 @@
 	    "      and/or check your value of ALT_MSDEVTOOLS_PATH. \n" \
 	    "" >> $(ERROR_FILE) ; \
 	fi
+  else
+    ifeq ($(wildcard $(REBASE)),)
+	@$(ECHO) "ERROR: Cannot find the REBASE utility from path: $(REBASE)\n" \
+	    "      This is normally obtained from the WINDOWSSDKDIR." \
+	    "" >> $(ERROR_FILE)
+    endif
+    ifeq ($(wildcard $(RC)),)
+	@$(ECHO) "ERROR: Cannot find the RC utility from path: $(RC)\n" \
+	    "      This is normally obtained from the WINDOWSSDKDIR." \
+	    "" >> $(ERROR_FILE)
+    endif
+    ifeq ($(wildcard $(DUMPBIN)),)
+	@$(ECHO) "ERROR: Cannot find the DUMPBIN utility from path: $(DUMPBIN)\n" \
+	    "      This is normally obtained from the WINDOWSSDKDIR." \
+	    "" >> $(ERROR_FILE)
+    endif
   endif
 endif
 
@@ -1258,10 +1267,10 @@
 sane-ant_version:
 	@if [ "$(ANT_CHECK)" != "same" \
 	      -a "$(ANT_CHECK)" != "newer" ]; then \
-	  $(ECHO) "WARNING: The version of ant being used is older than \n" \
+	  $(ECHO) "ERROR: The version of ant being used is older than \n" \
 	    "      the required version of '$(REQUIRED_ANT_VER)'. \n" \
 	    "      The version of ant found was '$(ANT_VER)'. \n" \
-	    "" >> $(WARNING_FILE) ; \
+	    "" >> $(ERROR_FILE) ; \
 	fi
 
 ######################################################
@@ -1468,25 +1477,6 @@
 endif
 
 ######################################################
-# Check for existence of INSTALL_MSIVAL2 on windows
-######################################################
-sane-install-msival2_path:
-ifeq ($(PLATFORM), windows)
-	@if [ -z "$(INSTALL_MSIVAL2)" ]; then \
-	  $(ECHO) "WARNING: Your INSTALL_MSIVAL2 setting is empty.\n" \
-	    "        It is recommended to set ALT_INSTALL_MSIVAL2.\n" \
-	    "" >> $(WARNING_FILE) ; \
-	fi
-	@if [ ! -r "$(INSTALL_MSIVAL2)" ]; then \
-	  $(ECHO) "ERROR: You do not have a valid INSTALL_MSIVAL2 setting. \n" \
-	    "      Please check your access to \n" \
-	    "          $(INSTALL_MSIVAL2) \n" \
-	    "      and/or check your value of ALT_INSTALL_MSIVAL2. \n" \
-	    "" >> $(ERROR_FILE) ; \
-	fi
-endif
-
-######################################################
 # Check the GNU C++ compiler for OJI plugin
 ######################################################
 sane-gcc-compiler:
--- a/make/java/Makefile	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/java/Makefile	Sun Feb 20 12:46:58 2011 -0800
@@ -34,7 +34,7 @@
 #
 # The order of subdirs here is important
 #
-SUBDIRS += hpi version jvm redist verify fdlibm java sun_nio jli main zip
+SUBDIRS += version jvm redist verify fdlibm java sun_nio jli main zip
 
 # Others
 #    Note: java_crw_demo java_hprof_demo are demos but must be delivered built in sdk
--- a/make/java/fdlibm/Makefile	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/java/fdlibm/Makefile	Sun Feb 20 12:46:58 2011 -0800
@@ -24,7 +24,7 @@
 #
 
 #
-# Makefile for native threads HPI.
+# Makefile for fdlibm
 #
 # Note:
 # The fdlibm libraries are built using special rules in Library.gmk.
--- a/make/java/hpi/Makefile	Thu Jan 27 22:35:53 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build HPI (Host Porting Interface) libraries
-#
-
-BUILDDIR = ../..
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Build specified the HPI implementations
-#
-SUBDIRS = $(HPIS)
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
-	$(SUBDIRS-loop)
-
--- a/make/java/hpi/hpi_common.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-#
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Shared files between the different threads types on Solaris. Be
-# careful when including this, you must get your variables right.
-#
-
-#
-# Common files on Solaris.
-#
-ifneq ($(PLATFORM), windows)
-FILES_c += \
-    interrupt.c \
-    linker_md.c \
-    memory_md.c \
-    system_md.c \
-    hpi.c
-endif
-
-#
-# Include paths can also be shared.
-#
-ifneq ($(PLATFORM), windows)
-OTHER_INCLUDES += \
-    -I$(PLATFORM_SRC)/hpi/$(THREADDIR)/include \
-    -I$(PLATFORM_SRC)/hpi/include \
-    -I$(PLATFORM_SRC)/hpi/export \
-    -I$(SHARE_SRC)/hpi/include \
-    -I$(SHARE_SRC)/hpi/export
-else
-OTHER_INCLUDES += \
-    -I$(PLATFORM_SRC)/hpi/include \
-    -I$(PLATFORM_SRC)/hpi/export \
-    -I$(SHARE_SRC)/hpi/include \
-    -I$(SHARE_SRC)/hpi/export
-endif
-
-#
-# Add to the default C and assembly file search paths.  Clear any initial
-# vpath settings to ensure that we don't look in unexpected places for HPI
-# files.
-#
-vpath %.c
-vpath %.c   $(PLATFORM_SRC)/hpi/$(THREADDIR)/src
-vpath %.c   $(PLATFORM_SRC)/hpi/src
-vpath %.c   $(SHARE_SRC)/hpi/src
-
-vpath %.s
-vpath %.s   $(PLATFORM_SRC)/hpi/$(THREADDIR)/src
-vpath %.s   $(PLATFORM_SRC)/hpi/src
-
-#
-# By default leave out locking statistics
-#
-ifneq ($(PLATFORM), windows)
-LOCKSTATS = false
-ifeq ($(LOCKSTATS), true)
-    CFLAGS_COMMON += -DLOCKSTATS
-endif
-endif
-
-#
-# Things that must be linked in.
-#
-ifneq ($(PLATFORM), windows)
-OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) $(LIBM) $(LIBDL)
-endif
--- a/make/java/hpi/native/Makefile	Thu Jan 27 22:35:53 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-#
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for native threads HPI.
-#
-
-BUILDDIR     = ../../..
-MODULE       = base
-LIBRARY      = hpi
-PRODUCT      = java
-THREADDIR    = native_threads
-LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/$(THREADDIR)
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Native threads specific C and .s files.
-#
-FILES_c = \
-	monitor_md.c \
-	threads_md.c \
-	condvar_md.c \
-	interrupt_md.c \
-	mutex_md.c \
-	sys_api_td.c \
-	threads_$(PLATFORM).c
-
-#
-# Other files/flags shared between the HPIs.
-#
-include $(BUILDDIR)/java/hpi/hpi_common.gmk
-
-#
-# Rules for the .so file.
-#
-ifeq ($(PLATFORM), solaris)
-  ifneq ($(ARCH), amd64)
-    FILES_reorder += reorder-$(ARCH)
-  endif
-endif
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-include $(BUILDDIR)/common/Library.gmk
-
-#
-# HPI flags for native threads.
-#
-OTHER_CPPFLAGS += -D_REENTRANT -DNATIVE
-
-ifeq ($(USE_PTHREADS),true)
-OTHER_CPPFLAGS += -DUSE_PTHREADS
-ifeq ($(MOOT_PRIORITIES),true)
-OTHER_CPPFLAGS += -DMOOT_PRIORITIES
-endif
-ifeq ($(PLATFORM), bsd)
-LIBPOSIX4      =
-OTHER_LDLIBS   += -pthread
-else
-LIBPOSIX4	= -lposix4
-OTHER_LDLIBS   += -lpthread $(LIBPOSIX4)
-endif
-endif
-
-ifneq ($(PLATFORM), bsd)
-HAVE_GETHRVTIME=true
-endif
-ifeq ($(HAVE_GETHRVTIME),true)
-OTHER_CPPFLAGS += -DHAVE_GETHRVTIME
-endif
-
-ifneq ($(OS_VENDOR), OpenBSD)
-HAVE_FILIOH=true
-endif
-ifeq ($(HAVE_FILIOH),true)
-OTHER_CPPFLAGS += -DHAVE_FILIOH
-endif
-
-ifeq ($(NO_INTERRUPTIBLE_IO),true)
-OTHER_CPPFLAGS += -DNO_INTERRUPTIBLE_IO
-endif
-
--- a/make/java/hpi/native/mapfile-vers	Thu Jan 27 22:35:53 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-#
-# Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-SUNWprivate_1.1 {
-   global:
-		DLL_Initialize;
-
-   local:
-           *;
-};
--- a/make/java/hpi/native/reorder-i586	Thu Jan 27 22:35:53 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-# Test Null
-text: .text%_init;
-text: .text%checkForCorrectLibthread: OUTPUTDIR/tmp/java/hpi/native_threads/obj/threads_solaris.o;
-text: .text%init64IO: OUTPUTDIR/tmp/java/hpi/native_threads/obj/system_md.o;
-text: .text%DLL_Initialize;
-text: .text%GetInterface: OUTPUTDIR/tmp/java/hpi/native_threads/obj/hpi.o;
-text: .text%sysBuildLibName;
-text: .text%sysLoadLibrary;
-text: .text%sysFindLibraryEntry;
-text: .text%sysNativePath;
-text: .text%sysOpen;
-text: .text%sysSeek;
-text: .text%lseek64_w;
-# Test Exit
-# Test Hello
-# Test Sleep
-# Test IntToString
-# Test LoadToolkit
-text: .text%sysAvailable;
-text: .text%sysFfileMode;
-text: .text%sysGetLastErrorString;
-# Test LoadFrame
-# Test LoadJFrame
-# Test JHello
-# SwingSet
--- a/make/java/hpi/native/reorder-sparc	Thu Jan 27 22:35:53 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-# Test Null
-text: .text%checkForCorrectLibthread: OUTPUTDIR/tmp/java/hpi/native_threads/obj/threads_solaris.o;
-text: .text%init64IO: OUTPUTDIR/tmp/java/hpi/native_threads/obj/system_md.o;
-text: .text%DLL_Initialize;
-text: .text%GetInterface: OUTPUTDIR/tmp/java/hpi/native_threads/obj/hpi.o;
-text: .text%sysBuildLibName;
-text: .text%sysLoadLibrary;
-text: .text%sysFindLibraryEntry;
-text: .text%sysNativePath;
-text: .text%sysOpen;
-text: .text%sysFfileMode;
-text: .text%sysSeek;
-text: .text%lseek64_w;
-text: .text%sysAvailable;
-# Test Exit
-# Test Hello
-# Test Sleep
-# Test IntToString
-# Test LoadToolkit
-text: .text%sysGetLastErrorString;
-# Test LoadFrame
-# Test LoadJFrame
-# Test JHello
-# SwingSet
--- a/make/java/hpi/native/reorder-sparcv9	Thu Jan 27 22:35:53 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-# Test Null
-text: .text%checkForCorrectLibthread: OUTPUTDIR/tmp/java/hpi/native_threads/obj64/threads_solaris.o;
-text: .text%init64IO: OUTPUTDIR/tmp/java/hpi/native_threads/obj64/system_md.o;
-text: .text%DLL_Initialize;
-text: .text%GetInterface: OUTPUTDIR/tmp/java/hpi/native_threads/obj64/hpi.o;
-text: .text%sysBuildLibName;
-text: .text%sysLoadLibrary;
-text: .text%sysFindLibraryEntry;
-text: .text%sysNativePath;
-text: .text%sysOpen;
-text: .text%sysFfileMode;
-text: .text%sysSeek;
-text: .text%lseek64_w;
-text: .text%sysAvailable;
-# Test Exit
-# Test Hello
-# Test Sleep
-# Test IntToString
-# Test LoadToolkit
-text: .text%sysGetLastErrorString;
-# Test LoadFrame
-# Test LoadJFrame
-# Test JHello
-# SwingSet
--- a/make/java/hpi/windows/Makefile	Thu Jan 27 22:35:53 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-#
-# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for Windows HPI DLL
-#
-BUILDDIR     = ../../..
-MODULE       = base
-LIBRARY      = hpi
-PRODUCT      = java
-THREADDIR    = windows_threads
-LIB_LOCATION = $(BINDIR)
-
-include $(BUILDDIR)/common/Defs.gmk
-
-# windows compiler flags
-ifeq ($(PLATFORM),windows)
-  CPPFLAGS_DBG += -DLOGGING
-endif
-
-FILES_c = \
-    linker_md.c \
-    memory_md.c \
-    monitor_md.c \
-    path_md.c \
-    socket_md.c \
-    sys_api_md.c \
-    system_md.c \
-    threads_md.c \
-    hpi.c # trailing blank required!
-
-JVMLIB = 
-JAVALIB =
-OTHER_LCF = -export:DLL_Initialize
-EXTRA_LIBS =
-
-
-#
-# Other files/flags shared between the HPIs.
-#
-include $(BUILDDIR)/java/hpi/hpi_common.gmk
-
-#
-# Rules for the .so file.
-#
-include $(BUILDDIR)/common/Library.gmk
-
--- a/make/java/java/FILES_java.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/java/java/FILES_java.gmk	Sun Feb 20 12:46:58 2011 -0800
@@ -443,7 +443,6 @@
             java/io/FileReader.java \
         java/io/PipedReader.java \
         java/io/StringReader.java \
-    java/io/TempFileHelper.java \
     java/io/Writer.java \
 	java/io/BufferedWriter.java \
 	    java/io/PrintWriter.java \
--- a/make/java/management/mapfile-vers	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/java/management/mapfile-vers	Sun Feb 20 12:46:58 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -70,14 +70,18 @@
 	    Java_sun_management_ThreadImpl_dumpThreads0;
 	    Java_sun_management_ThreadImpl_findDeadlockedThreads0;
 	    Java_sun_management_ThreadImpl_findMonitorDeadlockedThreads0;
-	    Java_sun_management_ThreadImpl_getThreadInfo0;
+	    Java_sun_management_ThreadImpl_getThreadInfo1;
 	    Java_sun_management_ThreadImpl_getThreads;
 	    Java_sun_management_ThreadImpl_getThreadTotalCpuTime0;
+	    Java_sun_management_ThreadImpl_getThreadTotalCpuTime1;
 	    Java_sun_management_ThreadImpl_getThreadUserCpuTime0;
+	    Java_sun_management_ThreadImpl_getThreadUserCpuTime1;
+	    Java_sun_management_ThreadImpl_getThreadAllocatedMemory1;
 	    Java_sun_management_ThreadImpl_resetContentionTimes0;
 	    Java_sun_management_ThreadImpl_resetPeakThreadCount0;
 	    Java_sun_management_ThreadImpl_setThreadContentionMonitoringEnabled0;
 	    Java_sun_management_ThreadImpl_setThreadCpuTimeEnabled0;
+	    Java_sun_management_ThreadImpl_setThreadAllocatedMemoryEnabled0;
 	    Java_sun_management_VMManagementImpl_getAvailableProcessors;
 	    Java_sun_management_VMManagementImpl_getClassInitializationTime;
 	    Java_sun_management_VMManagementImpl_getClassLoadingTime;
@@ -106,6 +110,7 @@
 	    Java_sun_management_VMManagementImpl_initOptionalSupportFields;
 	    Java_sun_management_VMManagementImpl_isThreadContentionMonitoringEnabled;
 	    Java_sun_management_VMManagementImpl_isThreadCpuTimeEnabled;
+	    Java_sun_management_VMManagementImpl_isThreadAllocatedMemoryEnabled;
             JNI_OnLoad;
 	local:
 	    *;
--- a/make/java/nio/FILES_java.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/java/nio/FILES_java.gmk	Sun Feb 20 12:46:58 2011 -0800
@@ -81,12 +81,12 @@
 	java/nio/file/ClosedDirectoryStreamException.java \
 	java/nio/file/ClosedFileSystemException.java \
 	java/nio/file/ClosedWatchServiceException.java \
+	java/nio/file/CopyMoveHelper.java \
 	java/nio/file/CopyOption.java \
 	java/nio/file/DirectoryIteratorException.java \
 	java/nio/file/DirectoryNotEmptyException.java \
 	java/nio/file/DirectoryStream.java \
 	java/nio/file/FileAlreadyExistsException.java \
-	java/nio/file/FileRef.java \
 	java/nio/file/FileStore.java \
 	java/nio/file/FileSystem.java \
 	java/nio/file/FileSystemAlreadyExistsException.java \
@@ -116,6 +116,7 @@
 	java/nio/file/StandardCopyOption.java \
 	java/nio/file/StandardOpenOption.java \
 	java/nio/file/StandardWatchEventKind.java \
+	java/nio/file/TempFileHelper.java \
 	java/nio/file/WatchEvent.java \
 	java/nio/file/WatchKey.java \
 	java/nio/file/WatchService.java \
@@ -127,7 +128,6 @@
 	java/nio/file/attribute/AclEntryType.java \
 	java/nio/file/attribute/AclFileAttributeView.java \
 	java/nio/file/attribute/AttributeView.java \
-	java/nio/file/attribute/Attributes.java \
 	java/nio/file/attribute/BasicFileAttributeView.java \
 	java/nio/file/attribute/BasicFileAttributes.java \
 	java/nio/file/attribute/DosFileAttributeView.java \
@@ -136,8 +136,6 @@
 	java/nio/file/attribute/FileAttributeView.java \
 	java/nio/file/attribute/FileOwnerAttributeView.java \
 	java/nio/file/attribute/FileStoreAttributeView.java \
-	java/nio/file/attribute/FileStoreSpaceAttributeView.java \
-	java/nio/file/attribute/FileStoreSpaceAttributes.java \
 	java/nio/file/attribute/FileTime.java \
 	java/nio/file/attribute/GroupPrincipal.java \
 	java/nio/file/attribute/UserDefinedFileAttributeView.java \
@@ -246,6 +244,7 @@
 	sun/nio/fs/AbstractAclFileAttributeView.java \
 	sun/nio/fs/AbstractBasicFileAttributeView.java \
 	sun/nio/fs/AbstractFileTypeDetector.java \
+        sun/nio/fs/AbstractFileSystemProvider.java \
 	sun/nio/fs/AbstractPath.java \
 	sun/nio/fs/AbstractPoller.java \
 	sun/nio/fs/AbstractUserDefinedFileAttributeView.java \
--- a/make/java/nio/Makefile	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/java/nio/Makefile	Sun Feb 20 12:46:58 2011 -0800
@@ -348,11 +348,6 @@
   -I$(PLATFORM_SRC)/native/java/net \
   -I$(CLASSHDRDIR)/../../../java.lang/java/CClassHeaders
 
-ifeq ($(PLATFORM), bsd)
-OTHER_INCLUDES += \
-  -I$(PLATFORM_SRC)/hpi/include
-endif
-
 ifeq ($(PLATFORM),windows)
   OTHER_LDLIBS += $(JVMLIB) ws2_32.lib \
      -libpath:$(LIBDIR) java.lib \
@@ -360,16 +355,15 @@
      $(OBJDIR)/../../../java.lang/java/$(OBJDIRNAME)/io_util.obj \
      $(OBJDIR)/../../../java.lang/java/$(OBJDIRNAME)/FileDescriptor_md.obj
 else
-ifeq ($(PLATFORM), solaris)
-OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 $(LIBDL)
-endif # solaris
-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet
 ifeq ($(PLATFORM), linux)
-OTHER_LDLIBS += -lpthread $(LIBDL)
+OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread $(LIBDL)
 endif
 ifeq ($(PLATFORM), bsd)
-OTHER_LDLIBS += -pthread
+OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -pthread
 endif
+ifeq ($(PLATFORM), solaris)
+OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 $(LIBDL) -lsendfile \
+		-L$(LIBDIR)/$(LIBARCH) -ljava -lnet
 endif # PLATFORM
 
 #
--- a/make/java/redist/Makefile	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/java/redist/Makefile	Sun Feb 20 12:46:58 2011 -0800
@@ -93,10 +93,6 @@
 
 IMPORT_LIST += $(MS_RUNTIME_LIBRARIES:%=$(BINDIR)/%)
 
-# NOTE: These might actually come from BUILDDIR, depends on the settings.
-$(BINDIR)/msvcrt.dll: $(MSVCRT_DLL_PATH)/msvcrt.dll
-	$(install-import-file)
-	$(call chmod-file, a+x)
 $(BINDIR)/$(MSVCRNN_DLL): $(MSVCRNN_DLL_PATH)/$(MSVCRNN_DLL)
 	$(install-import-file)
 	$(call chmod-file, a+x)
@@ -223,12 +219,15 @@
 
 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVM_NAME)
 	$(install-import-file)
+	@$(call binary_file_verification,$@)
 
 $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVM_NAME): $(HOTSPOT_KERNEL_PATH)/$(JVM_NAME)
 	$(install-file)
+	@$(call binary_file_verification,$@)
 
 $(LIB_LOCATION)/$(LIBJSIG_NAME): $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_NAME)
 	$(install-import-file)
+	@$(call binary_file_verification,$@)
 
 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME) \
 $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME):
@@ -237,30 +236,39 @@
 
 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDB_NAME)
 	$(install-import-file)
+	@$(call binary_file_verification,$@)
 
 $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDB_NAME): $(HOTSPOT_CLIENT_PATH)/64/$(JVMDB_NAME)
 	$(install-import-file)
+	@$(call binary_file_verification,$@)
 
 $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMDB_NAME)
 	$(install-import-file)
+	@$(call binary_file_verification,$@)
 
 $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDB_NAME): $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_NAME)
 	$(install-import-file)
+	@$(call binary_file_verification,$@)
 
 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDTRACE_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_NAME)
 	$(install-import-file)
+	@$(call binary_file_verification,$@)
 
 $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDTRACE_NAME): $(HOTSPOT_CLIENT_PATH)/64/$(JVMDTRACE_NAME)
 	$(install-import-file)
+	@$(call binary_file_verification,$@)
 
 $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDTRACE_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMDTRACE_NAME)
 	$(install-import-file)
+	@$(call binary_file_verification,$@)
 
 $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDTRACE_NAME): $(HOTSPOT_SERVER_PATH)/64/$(JVMDTRACE_NAME)
 	$(install-import-file)
+	@$(call binary_file_verification,$@)
 
 $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_NAME): $(HOTSPOT_SERVER_PATH)/$(JVM_NAME)
 	$(install-import-file)
+	@$(call binary_file_verification,$@)
 
 $(LIB_LOCATION)/$(SERVER_LOCATION)/Xusage.txt : $(HOTSPOT_SERVER_PATH)/Xusage.txt
 	$(install-import-file)
--- a/make/jdk_generic_profile.sh	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/jdk_generic_profile.sh	Sun Feb 20 12:46:58 2011 -0800
@@ -50,7 +50,7 @@
 #
 # Assumes basic unix utilities are in the PATH already (uname, hostname, etc.).
 #
-# On Windows, assumes PROCESSOR_IDENTIFIER, VS71COMNTOOLS,
+# On Windows, assumes PROCESSOR_IDENTIFIER, VS100COMNTOOLS,
 #   SYSTEMROOT (or SystemRoot), COMPUTERNAME (or hostname works), and
 #   USERNAME is defined in the environment.
 #   This profile does not rely on using vcvars32.bat and 64bit Setup.bat.
@@ -81,8 +81,7 @@
 #    Windows Only:
 #      ALT_UNIXCOMMAND_PATH
 #      ALT_DXSDK_PATH
-#      ALT_MSVCRT_DLL_PATH
-#      ALT_MSVCR71_DLL_PATH
+#      ALT_MSVCRNN_DLL_PATH
 #
 #############################################################################
 #
@@ -213,78 +212,17 @@
   # Compiler setup (nasty part)
   #   NOTE: You can use vcvars32.bat to set PATH, LIB, and INCLUDE.
   #   NOTE: CYGWIN has a link.exe too, make sure the compilers are first
-  if [ "${windows_arch}" = i586 ] ; then
-    # 32bit Windows compiler settings
-    # VisualStudio .NET 2003 VC++ 7.1 (VS71COMNTOOLS should be defined)
-    vs_root=$(${cygpath} "${VS71COMNTOOLS}/../..")
-    # Fill in PATH, LIB, and INCLUDE (unset all others to make sure)
-    vc7_root="${vs_root}/Vc7"
-    compiler_path="${vc7_root}/bin"
-    platform_sdk="${vc7_root}/PlatformSDK"
-        
-    # LIB and INCLUDE must use ; as a separator
-    include4sdk="${vc7_root}/atlmfc/include"
-    include4sdk="${include4sdk};${vc7_root}/include"
-    include4sdk="${include4sdk};${platform_sdk}/include/prerelease"
-    include4sdk="${include4sdk};${platform_sdk}/include"
-    include4sdk="${include4sdk};${vs_root}/SDK/v1.1/include"
-    lib4sdk="${lib4sdk};${vc7_root}/lib"
-    lib4sdk="${lib4sdk};${platform_sdk}/lib/prerelease"
-    lib4sdk="${lib4sdk};${platform_sdk}/lib"
-    lib4sdk="${lib4sdk};${vs_root}/SDK/v1.1/lib"
-    # Search path and DLL locating path
-    #   WARNING: CYGWIN has a link.exe too, make sure compilers are first
-    path4sdk="${vs_root}/Common7/Tools/bin;${path4sdk}"
-    path4sdk="${vs_root}/SDK/v1.1/bin;${path4sdk}"
-    path4sdk="${vs_root}/Common7/Tools;${path4sdk}"
-    path4sdk="${vs_root}/Common7/Tools/bin/prerelease;${path4sdk}"
-    path4sdk="${vs_root}/Common7/IDE;${path4sdk}"
-    path4sdk="${compiler_path};${path4sdk}"
-  elif [ "${windows_arch}" = amd64 ] ; then
-    # AMD64 64bit Windows compiler settings
-    if [ "${ALT_DEPLOY_MSSDK}" != "" ] ; then
-      platform_sdk=${ALT_DEPLOY_MSSDK}
-    else
-      platform_sdk=$(${cygpath} "C:/Program Files/Microsoft Platform SDK/")
-    fi
-    if [ "${ALT_COMPILER_PATH}" != "" ] ; then
-      compiler_path=${ALT_COMPILER_PATH}
-      if [ "${ALT_DEPLOY_MSSDK}" = "" ] ; then
-        platform_sdk=${ALT_COMPILER_PATH}/../../../..
-      fi
-    else
-      compiler_path="${platform_sdk}/Bin/win64/x86/AMD64"
-    fi
-    # LIB and INCLUDE must use ; as a separator
-    include4sdk="${platform_sdk}/Include"
-    include4sdk="${include4sdk};${platform_sdk}/Include/crt/sys"
-    include4sdk="${include4sdk};${platform_sdk}/Include/mfc"
-    include4sdk="${include4sdk};${platform_sdk}/Include/atl"
-    include4sdk="${include4sdk};${platform_sdk}/Include/crt"
-    lib4sdk="${platform_sdk}/Lib/AMD64"
-    lib4sdk="${lib4sdk};${platform_sdk}/Lib/AMD64/atlmfc"
-    # Search path and DLL locating path
-    #   WARNING: CYGWIN has a link.exe too, make sure compilers are first
-    path4sdk="${platform_sdk}/bin;${path4sdk}"
-    path4sdk="${compiler_path};${path4sdk}"
+
+  # Use supplied vsvars.sh
+  repo=`hg root`
+  if [ -f "${repo}/make/scripts/vsvars.sh" ] ; then
+    eval `sh ${repo}/make/scripts/vsvars.sh -v10`
+  elif [ -f "${repo}/../make/scripts/vsvars.sh" ] ; then
+    eval `sh ${repo}/../make/scripts/vsvars.sh -v10`
+  else
+    echo "WARNING: No make/scripts/vsvars.sh file found"
   fi
-  # Export LIB and INCLUDE
-  unset lib
-  unset Lib
-  LIB="${lib4sdk}"
-  export LIB
-  unset include
-  unset Include
-  INCLUDE="${include4sdk}"
-  export INCLUDE
     
-  # Turn all \\ into /, remove duplicates and trailing /
-  slash_path="$(echo ${path4sdk} | sed -e 's@\\\\@/@g' -e 's@//@/@g' -e 's@/$@@' -e 's@/;@;@g')"
-  path4sdk="${slash_path}"
-   
-  # Convert path4sdk to cygwin style
-  path4sdk="$(/usr/bin/cygpath -p ${path4sdk})"
-
 fi
 
 # Get the previous JDK to be used to bootstrap the build
--- a/make/mkdemo/jfc/Makefile	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/mkdemo/jfc/Makefile	Sun Feb 20 12:46:58 2011 -0800
@@ -43,7 +43,7 @@
 
 # Some demos aren't currently included in OpenJDK
 ifndef OPENJDK
-  SUBDIRS += Java2D SwingSet2 Stylepad
+  SUBDIRS += Java2D SwingSet2 SwingSet3 Stylepad
 endif
 
 include $(BUILDDIR)/common/Subdirs.gmk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/mkdemo/jfc/SwingSet3/Makefile	Sun Feb 20 12:46:58 2011 -0800
@@ -0,0 +1,43 @@
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#
+# Makefile to build the SwingSet3 demo.
+#
+
+BUILDDIR = ../../..
+PRODUCT = demo/jfc
+DEMONAME = SwingSet3
+include $(BUILDDIR)/common/Defs.gmk
+
+DEMO_ROOT       = $(CLOSED_SRC)/share/demo/jfc/$(DEMONAME)
+DEMO_DESTDIR    = $(DEMODIR)/jfc/$(DEMONAME)
+DEMO_TOPFILES	= ./readme.html ./swingset3.png
+DEMO_SKIP_SRCZIP = true
+
+#
+# Demo jar building rules.
+#
+include $(BUILDDIR)/common/Demo.gmk
--- a/make/modules/modules.config	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/modules/modules.config	Sun Feb 20 12:46:58 2011 -0800
@@ -771,12 +771,7 @@
 
 /**************************************************************************/
 
-module jkernel {
-    include sun.jkernel.*;
-}
-
 module deploy {
-    include jkernel;
 
     // For now, all plugin and JNLP
     include com.sun.java.browser.**,
--- a/make/netbeans/common/java-data-native.ent	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/netbeans/common/java-data-native.ent	Sun Feb 20 12:46:58 2011 -0800
@@ -31,7 +31,7 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 
-<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
+<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3">
     <compilation-unit>
         <package-root>${root}/src/share/classes</package-root>
         <package-root>${root}/src/windows/classes</package-root>
@@ -39,6 +39,6 @@
         <classpath mode="boot">${bootstrap.jdk}/jre/lib/rt.jar</classpath>
         <built-to>${root}/build/${platform}-${arch}/classes</built-to>
         <javadoc-built-to>${root}/build/javadoc/${name}</javadoc-built-to>
-        <source-level>1.5</source-level>
+        <source-level>1.7</source-level>
     </compilation-unit>
 </java-data>
--- a/make/netbeans/common/java-data-no-native.ent	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/netbeans/common/java-data-no-native.ent	Sun Feb 20 12:46:58 2011 -0800
@@ -31,12 +31,12 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 
-<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
+<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3">
     <compilation-unit>
         <package-root>${root}/src/share/classes</package-root>
         <classpath mode="boot">${bootstrap.jdk}/jre/lib/rt.jar</classpath>
         <built-to>${root}/build/${platform}-${arch}/classes</built-to>
         <javadoc-built-to>${root}/build/javadoc/${name}</javadoc-built-to>
-        <source-level>1.5</source-level>
+        <source-level>1.7</source-level>
     </compilation-unit>
 </java-data>
--- a/make/sun/Makefile	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/sun/Makefile	Sun Feb 20 12:46:58 2011 -0800
@@ -74,8 +74,7 @@
                      $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \
                      jawt font jpeg cmm applet beans
 SUBDIRS_management = management
-SUBDIRS_misc       = jkernel $(ORG_SUBDIR) \
-                     rmi $(JDBC_SUBDIR) tracing
+SUBDIRS_misc       = $(ORG_SUBDIR) rmi $(JDBC_SUBDIR) tracing
 SUBDIRS_tools      = native2ascii serialver tools jconsole
 include $(BUILDDIR)/common/Subdirs.gmk
 
--- a/make/sun/awt/Makefile	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/sun/awt/Makefile	Sun Feb 20 12:46:58 2011 -0800
@@ -376,10 +376,6 @@
 _FONTCONFIGS	= \
 	fontconfig.properties				\
 	fontconfig.RedHat.properties			\
-	fontconfig.RedHat.2.1.properties		\
-	fontconfig.RedHat.3.properties		        \
-	fontconfig.RedHat.4.properties			\
-	fontconfig.Sun.properties			\
 	fontconfig.Turbo.properties			\
 	fontconfig.SuSE.10.properties                   \
 	fontconfig.SuSE.11.properties
@@ -395,9 +391,7 @@
 
 FONTCONFIGS_SRC	= $(PLATFORM_SRC)/classes/sun/awt/fontconfigs
 _FONTCONFIGS	= \
-	fontconfig.properties	\
-	fontconfig.5.9.properties	\
-	fontconfig.5.8.properties
+	fontconfig.properties
 
 FONTCONFIGS_SRC_PREFIX = $(PLATFORM).
 
--- a/make/sun/awt/mapfile-mawt-vers	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/sun/awt/mapfile-mawt-vers	Sun Feb 20 12:46:58 2011 -0800
@@ -515,8 +515,7 @@
 		getDefaultConfig;
                 Java_sun_font_FontConfigManager_getFontConfig;
                 Java_sun_font_FontConfigManager_getFontConfigAASettings;
-		Java_sun_awt_X11FontManager_getFontPath;
-		Java_sun_awt_X11FontManager_setNativeFontPath;
+		Java_sun_awt_X11FontManager_getFontPathNative;
 		Java_sun_font_SunFontManager_populateFontFileNameMap;
 
 		# CDE private entry point
--- a/make/sun/awt/mapfile-vers-linux	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/sun/awt/mapfile-vers-linux	Sun Feb 20 12:46:58 2011 -0800
@@ -537,8 +537,7 @@
 		getDefaultConfig;
                 Java_sun_font_FontConfigManager_getFontConfig;
                 Java_sun_font_FontConfigManager_getFontConfigAASettings;
-		Java_sun_awt_X11FontManager_getFontPath;
-		Java_sun_awt_X11FontManager_setNativeFontPath;
+		Java_sun_awt_X11FontManager_getFontPathNative;
 		Java_sun_font_SunFontManager_populateFontFileNameMap;
 
 		# CDE private entry point
--- a/make/sun/headless/mapfile-vers	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/sun/headless/mapfile-vers	Sun Feb 20 12:46:58 2011 -0800
@@ -65,7 +65,7 @@
                 Java_sun_font_FontConfigManager_getFontConfig;
                 Java_sun_font_FontConfigManager_getFontConfigAASettings;
                 Java_sun_font_FontConfigManager_getFontConfigVersion;
-		Java_sun_awt_X11FontManager_getFontPath;
+                Java_sun_awt_X11FontManager_getFontPathNative;
 
 		Java_sun_awt_FontDescriptor_initIDs;
 		Java_sun_awt_PlatformFont_initIDs;
--- a/make/sun/jkernel/FILES_c_windows.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_cpp = \
-	stdafx.cpp \
-	kernel.cpp \
-	DownloadDialog.cpp \
-	DownloadHelper.cpp \
-	DownloadHelper.cpp
-
-
-FILES_rc = kernel.rc
-
-# FILES_export definitions for Win32
-
-FILES_export = \
-	sun/jkernel/DownloadManager.java \
-	sun/jkernel/Mutex.java \
-	sun/jkernel/Bundle.java \
-	sun/jkernel/BackgroundDownloader.java \
--- a/make/sun/jkernel/FILES_java.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_java = \
-	$(TARGDIR)sun/jkernel/BackgroundDownloader.java \
-	$(TARGDIR)sun/jkernel/Bundle.java \
-	$(TARGDIR)sun/jkernel/ByteArrayToFromHexDigits.java \
-	$(TARGDIR)sun/jkernel/BundleCheck.java \
-	$(TARGDIR)sun/jkernel/DownloadManager.java \
-	$(TARGDIR)sun/jkernel/Mutex.java \
-	$(TARGDIR)sun/jkernel/StandaloneByteArrayAccess.java \
-	$(TARGDIR)sun/jkernel/StandaloneMessageDigest.java \
-	$(TARGDIR)sun/jkernel/StandaloneSHA.java \
-
-FILES_export = \
-     sun/jkernel/DownloadManager.java \
-     sun/jkernel/Mutex.java \
-     sun/jkernel/Bundle.java \
-     sun/jkernel/BackgroundDownloader.java
--- a/make/sun/jkernel/Makefile	Thu Jan 27 22:35:53 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-MODULE  = jkernel
-PACKAGE = sun.jkernel
-LIBRARY = jkernel
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Use highest optimization level
-#
-_OPT = $(CC_HIGHEST_OPT)
-
-#
-# Java source files
-#
-include FILES_java.gmk
-AUTO_FILES_JAVA_DIRS = sun/jkernel
-
-LOCALE_SUFFIXES = $(JDK_LOCALES)
-
-#
-# Native source files
-#
-
-ifeq ($(ARCH_DATA_MODEL), 32) 
-
-ifeq ($(PLATFORM), windows)
-
-# If this is the VS Express compiler it will lack vc/atlmfc/
-ATL_MFC_DIR :=$(call DirExists,$(COMPILER_PATH)/../atlmfc,,)
-
-ifneq ($(ATL_MFC_DIR),)
-
-include FILES_c_windows.gmk
-
-vpath %.cpp   $(PLATFORM_SRC)/native/sun/jkernel
-
-
-VERSIONINFO_RESOURCE = $(PLATFORM_SRC)/native/sun/jkernel/kernel.rc
-
-LDLIBS += urlmon.lib wininet.lib shlwapi.lib version.lib comctl32.lib gdi32.lib -def:$(PLATFORM_SRC)/native/sun/jkernel/kernel.def
-
-include $(BUILDDIR)/common/Library.gmk
-
-endif
-
-endif
-
-endif
-
-#
-# Resources
-#
-include $(TOPDIR)/make/common/internal/Resources.gmk
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-# If extra compression is going to be available in the deploy build enable 
-# its use here by defining the JRE-relative pathname of the shared library
-
-ifeq ($(PLATFORM), windows)
-  ifdef EXTRA_COMP_INSTALL_PATH
-    CPPFLAGS += -DEXTRA_COMP_INSTALL_PATH=$(EXTRA_COMP_INSTALL_PATH)
-  endif
-endif
--- a/make/sun/net/FILES_java.gmk	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/sun/net/FILES_java.gmk	Sun Feb 20 12:46:58 2011 -0800
@@ -33,6 +33,7 @@
 	sun/net/ProgressEvent.java \
 	sun/net/ProgressListener.java \
 	sun/net/ProgressMeteringPolicy.java \
+	sun/net/SocksProxy.java \
 	sun/net/TelnetInputStream.java \
 	sun/net/TelnetOutputStream.java \
 	sun/net/TelnetProtocolException.java \
--- a/make/sun/xawt/Makefile	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/sun/xawt/Makefile	Sun Feb 20 12:46:58 2011 -0800
@@ -144,8 +144,25 @@
               -I$(OPENWIN_HOME)/include 
 endif
 
+# We have some odd logic here because some Solaris 10 updates
+# have a render.h file that suggests gradients are supported, but
+# the Xrender.h doesn't have the corresponding type definitions.
+# Earlier updates have neither. We'd like to know if there's a mismatch.
+# Whilst in the C preprocessor we can tell if the render.h define's are set
+# we can't tell anything about C declarations.
+# A grep of Xrender.h is the only way to know this. If they are absent
+# we will set a flag indicating this mismatch and the JDK source file
+# will interpret it to resolve the problem.
 ifeq ($(PLATFORM), solaris)
   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
+  OS_VERSION := $(shell uname -r)
+  XRENDER_H := $(OPENWIN_HOME)/share/include/X11/extensions/Xrender.h
+  ifeq ($(OS_VERSION),5.10) 
+     LINEARGRADIENT_CNT := $(shell $(EGREP) -c XLinearGradient $(XRENDER_H))
+     ifeq ($(LINEARGRADIENT_CNT),0) 
+       CFLAGS+= -DSOLARIS10_NO_XRENDER_STRUCTS
+     endif
+ endif
 endif
 
 ifeq ($(PLATFORM), bsd)
--- a/make/sun/xawt/mapfile-vers	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/sun/xawt/mapfile-vers	Sun Feb 20 12:46:58 2011 -0800
@@ -188,8 +188,7 @@
         Java_sun_font_FontConfigManager_getFontConfig;
         Java_sun_font_FontConfigManager_getFontConfigAASettings;
         Java_sun_font_FontConfigManager_getFontConfigVersion;
-	Java_sun_awt_X11FontManager_getFontPath;
-	Java_sun_font_X11FontManager_setNativeFontPath;
+	Java_sun_awt_X11FontManager_getFontPathNative;
         Java_sun_awt_X11GraphicsEnvironment_initDisplay;
         Java_sun_awt_X11GraphicsEnvironment_initGLX;
 	Java_sun_awt_X11GraphicsEnvironment_initXRender;
--- a/make/tools/reorder/Makefile	Thu Jan 27 22:35:53 2011 -0800
+++ b/make/tools/reorder/Makefile	Sun Feb 20 12:46:58 2011 -0800
@@ -85,7 +85,6 @@
 libs.reorder :
 ifeq ($(PLATFORM), solaris)
 	$(MAKE) LIBBLDDIR=java/zip        LIBTMPDIR=sun/java.util.zip/zip   reorder.lib
-	$(MAKE) LIBBLDDIR=java/hpi/native LIBTMPDIR=java/hpi/native_threads reorder.lib
 	$(MAKE) LIBBLDDIR=java/java       LIBTMPDIR=java/java.lang/java     reorder.lib
 	$(MAKE) LIBBLDDIR=java/nio        LIBTMPDIR=java/java.nio/nio       reorder.lib
 	$(MAKE) LIBBLDDIR=sun/font        LIBTMPDIR=sun/sun.awt.font/fontmanager reorder.lib
@@ -96,7 +95,6 @@
 libs.copy:
 ifeq ($(PLATFORM), solaris)
 	$(CP) $(OUTDIR)/reorder_java_zip-$(ARCH) ../../java/zip/reorder-$(ARCH)
-	$(CP) $(OUTDIR)/reorder_java_hpi_native-$(ARCH) ../../java/hpi/native/reorder-$(ARCH)
 	$(CP) $(OUTDIR)/reorder_java_java-$(ARCH) ../../java/java/reorder-$(ARCH)
 	$(CP) $(OUTDIR)/reorder_sun_font-$(ARCH) ../../sun/font/reorder-$(ARCH)
 	$(CP) $(OUTDIR)/reorder_sun_jpeg-$(ARCH) ../../sun/jpeg/reorder-$(ARCH)
--- a/src/share/back/debugInit.c	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/back/debugInit.c	Sun Feb 20 12:46:58 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -133,27 +133,60 @@
     return error;
 }
 
+typedef struct {
+    int major;
+    int minor;
+} version_type;
+
+typedef struct {
+    version_type runtime;
+    version_type compiletime;
+} compatible_versions_type;
+
+/*
+ * List of explicitly compatible JVMTI versions, specified as
+ * { runtime version, compile-time version } pairs. -1 is a wildcard.
+ */
+static int nof_compatible_versions = 3;
+static compatible_versions_type compatible_versions_list[] = {
+    /*
+     * FIXUP: Allow version 0 to be compatible with anything
+     * Special check for FCS of 1.0.
+     */
+    { {  0, -1 }, { -1, -1 } },
+    { { -1, -1 }, {  0, -1 } },
+    /*
+     * 1.2 is runtime compatible with 1.1 -- just make sure to check the
+     * version before using any new 1.2 features
+     */
+    { {  1,  1 }, {  1,  2 } }
+};
+
+
 /* Logic to determine JVMTI version compatibility */
 static jboolean
 compatible_versions(jint major_runtime,     jint minor_runtime,
                     jint major_compiletime, jint minor_compiletime)
 {
-#if 1 /* FIXUP: We allow version 0 to be compatible with anything */
-    /* Special check for FCS of 1.0. */
-    if ( major_runtime == 0 || major_compiletime == 0 ) {
-        return JNI_TRUE;
+    /*
+     * First check to see if versions are explicitly compatible via the
+     * list specified above.
+     */
+    int i;
+    for (i = 0; i < nof_compatible_versions; ++i) {
+        version_type runtime = compatible_versions_list[i].runtime;
+        version_type comptime = compatible_versions_list[i].compiletime;
+
+        if ((major_runtime     == runtime.major  || runtime.major  == -1) &&
+            (minor_runtime     == runtime.minor  || runtime.minor  == -1) &&
+            (major_compiletime == comptime.major || comptime.major == -1) &&
+            (minor_compiletime == comptime.minor || comptime.minor == -1)) {
+            return JNI_TRUE;
+        }
     }
-#endif
-    /* Runtime major version must match. */
-    if ( major_runtime != major_compiletime ) {
-        return JNI_FALSE;
-    }
-    /* Runtime minor version must be >= the version compiled with. */
-    if ( minor_runtime < minor_compiletime ) {
-        return JNI_FALSE;
-    }
-    /* Assumed compatible */
-    return JNI_TRUE;
+
+    return major_runtime == major_compiletime &&
+           minor_runtime >= minor_compiletime;
 }
 
 /* OnLoad startup:
--- a/src/share/back/eventFilter.c	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/back/eventFilter.c	Sun Feb 20 12:46:58 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,7 @@
 #include "stepControl.h"
 #include "threadControl.h"
 #include "SDE.h"
+#include "jvmti.h"
 
 typedef struct ClassFilter {
     jclass clazz;
@@ -275,6 +276,24 @@
     }
 }
 
+static jboolean isVersionGte12x() {
+    jint version;
+    jvmtiError err =
+        JVMTI_FUNC_PTR(gdata->jvmti,GetVersionNumber)(gdata->jvmti, &version);
+
+    if (err == JVMTI_ERROR_NONE) {
+        jint major, minor;
+
+        major = (version & JVMTI_VERSION_MASK_MAJOR)
+                    >> JVMTI_VERSION_SHIFT_MAJOR;
+        minor = (version & JVMTI_VERSION_MASK_MINOR)
+                    >> JVMTI_VERSION_SHIFT_MINOR;
+        return (major > 1 || major == 1 && minor >= 2);
+    } else {
+        return JNI_FALSE;
+    }
+}
+
 /* Return the object instance in which the event occurred */
 /* Return NULL if static or if an error occurs */
 static jobject
@@ -286,6 +305,14 @@
     jint        modifiers       = 0;
     jvmtiError  error;
 
+    static jboolean got_version = JNI_FALSE;
+    static jboolean is_version_gte_12x = JNI_FALSE;
+
+    if (!got_version) {
+        is_version_gte_12x = isVersionGte12x();
+        got_version = JNI_TRUE;
+    }
+
     switch (evinfo->ei) {
         case EI_SINGLE_STEP:
         case EI_BREAKPOINT:
@@ -314,11 +341,18 @@
     /* fail if error or static (0x8) */
     if (error == JVMTI_ERROR_NONE && thread!=NULL && (modifiers & 0x8) == 0) {
         FrameNumber fnum            = 0;
-        /* get slot zero object "this" */
-        error = JVMTI_FUNC_PTR(gdata->jvmti,GetLocalObject)
-                    (gdata->jvmti, thread, fnum, 0, &object);
-        if (error != JVMTI_ERROR_NONE)
+        if (is_version_gte_12x) {
+            /* Use new 1.2.x function, GetLocalInstance */
+            error = JVMTI_FUNC_PTR(gdata->jvmti,GetLocalInstance)
+                        (gdata->jvmti, thread, fnum, &object);
+        } else {
+            /* get slot zero object "this" */
+            error = JVMTI_FUNC_PTR(gdata->jvmti,GetLocalObject)
+                        (gdata->jvmti, thread, fnum, 0, &object);
+        }
+        if (error != JVMTI_ERROR_NONE) {
             object = NULL;
+        }
     }
 
     return object;
--- a/src/share/bin/java.c	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/bin/java.c	Sun Feb 20 12:46:58 2011 -0800
@@ -98,15 +98,15 @@
  * Prototypes for functions internal to launcher.
  */
 static void SetClassPath(const char *s);
-static void SetModulesBootClassPath(const char *s);
 static void SelectVersion(int argc, char **argv, char **main_class);
-static jboolean ParseArguments(int *pargc, char ***pargv, char **pjarfile,
-                               char **pclassname, int *pret, const char *jvmpath);
+static jboolean ParseArguments(int *pargc, char ***pargv,
+                               int *pmode, char **pwhat,
+                               int *pret, const char *jrepath);
 static jboolean InitializeJVM(JavaVM **pvm, JNIEnv **penv,
                               InvocationFunctions *ifn);
 static jstring NewPlatformString(JNIEnv *env, char *s);
 static jobjectArray NewPlatformStringArray(JNIEnv *env, char **strv, int strc);
-static jclass LoadMainClass(JNIEnv *env, jboolean isJar, char *name);
+static jclass LoadMainClass(JNIEnv *env, int mode, char *name);
 
 static void TranslateApplicationArgs(int jargc, const char **jargv, int *pargc, char ***pargv);
 static jboolean AddApplicationOptions(int cpathc, const char **cpathv);
@@ -166,18 +166,27 @@
  * Running Java code in primordial thread caused many problems. We will
  * create a new thread to invoke JVM. See 6316197 for more information.
  */
-static jlong threadStackSize    = 0;  /* stack size of the new thread */
+static jlong threadStackSize = 0;  /* stack size of the new thread */
 static jlong maxHeapSize        = 0;  /* max heap size */
 static jlong initialHeapSize    = 0;  /* inital heap size */
 
 int JNICALL JavaMain(void * args); /* entry point                  */
 
+enum LaunchMode {               // cf. sun.launcher.LauncherHelper
+    LM_UNKNOWN = 0,
+    LM_CLASS,
+    LM_JAR
+};
+
+static const char *launchModeNames[]
+    = { "Unknown", "Main class", "JAR file" };
+
 typedef struct {
-  int     argc;
-  char ** argv;
-  char *  jarfile;
-  char *  classname;
-  InvocationFunctions ifn;
+    int    argc;
+    char **argv;
+    int    mode;
+    char  *what;
+    InvocationFunctions ifn;
 } JavaMainArgs;
 
 /*
@@ -197,8 +206,8 @@
         jint ergo                               /* ergonomics class policy */
 )
 {
-    char *jarfile = 0;
-    char *classname = 0;
+    int mode = LM_UNKNOWN;
+    char *what = NULL;
     char *cpath = 0;
     char *main_class = NULL;
     int ret;
@@ -243,6 +252,7 @@
         for (i = 0; i < argc ; i++) {
             printf("argv[%d] = %s\n", i, argv[i]);
         }
+        AddOption("-Dsun.java.launcher.diag=true", NULL);
     }
 
     CreateExecutionEnvironment(&argc, &argv,
@@ -285,24 +295,21 @@
         SetClassPath(cpath);
     }
 
-    /*
-     *  Parse command line options; if the return value of
-     *  ParseArguments is false, the program should exit.
+    /* Parse command line options; if the return value of
+     * ParseArguments is false, the program should exit.
      */
-    if (!ParseArguments(&argc, &argv, &jarfile, &classname, &ret, jvmpath)) {
+    if (!ParseArguments(&argc, &argv, &mode, &what, &ret, jrepath))
+    {
         return(ret);
     }
 
-    /* Set bootclasspath for modules */
-    SetModulesBootClassPath(jrepath);
-
     /* Override class path if -jar flag was specified */
-    if (jarfile != 0) {
-        SetClassPath(jarfile);
+    if (mode == LM_JAR) {
+        SetClassPath(what);     /* Override class path */
     }
 
     /* set the -Dsun.java.command pseudo property */
-    SetJavaCommandLineProp(classname, jarfile, argc, argv);
+    SetJavaCommandLineProp(what, argc, argv);
 
     /* Set the -Dsun.java.launcher pseudo property */
     SetJavaLauncherProp();
@@ -312,16 +319,17 @@
 
     /* Show the splash screen if needed */
     ShowSplashScreen();
-   
+
 #ifdef __APPLE__
     if (continueInSameThread == JNI_TRUE) {
-        return ContinueInSameThread(&ifn, argc, argv, jarfile, classname, ret);
+        return ContinueInSameThread(&ifn, argc, argv, mode, what, ret);
     } else {
-        return ContinueInNewThread(&ifn, argc, argv, jarfile, classname, ret);
+        return ContinueInNewThread(&ifn, argc, argv, mode, what, ret);
     }
 #else
-    return ContinueInNewThread(&ifn, argc, argv, jarfile, classname, ret);
+    return ContinueInNewThread(&ifn, argc, argv, mode, what, ret);
 #endif
+
 }
 /*
  * Always detach the main thread so that it appears to have ended when
@@ -368,13 +376,13 @@
     JavaMainArgs *args = (JavaMainArgs *)_args;
     int argc = args->argc;
     char **argv = args->argv;
-    char *jarfile = args->jarfile;
-    char *classname = args->classname;
+    int mode = args->mode;
+    char *what = args->what;
     InvocationFunctions ifn = args->ifn;
 
     JavaVM *vm = 0;
     JNIEnv *env = 0;
-    jclass mainClass;
+    jclass mainClass = NULL;
     jmethodID mainID;
     jobjectArray mainArgs;
     int ret = 0;
@@ -400,7 +408,7 @@
         CHECK_EXCEPTION_LEAVE(1);
     }
     /* If the user specified neither a class name nor a JAR file */
-    if (printXUsage || printUsage || (jarfile == 0 && classname == 0)) {
+    if (printXUsage || printUsage || what == 0 || mode == LM_UNKNOWN) {
         PrintUsage(env, printXUsage);
         CHECK_EXCEPTION_LEAVE(1);
         LEAVE();
@@ -414,11 +422,11 @@
                (long)(jint)Counter2Micros(end-start));
     }
 
-    /* At this stage, argc/argv have the applications' arguments */
+    /* At this stage, argc/argv have the application's arguments */
     if (JLI_IsTraceLauncher()){
         int i;
-        printf("Main-Class is '%s'\n", classname ? classname : "");
-        printf("Apps' argc is %d\n", argc);
+        printf("%s is '%s'\n", launchModeNames[mode], what);
+        printf("App's argc is %d\n", argc);
         for (i=0; i < argc; i++) {
             printf("    argv[%2d] = '%s'\n", i, argv[i]);
         }
@@ -446,11 +454,7 @@
      *     2)   Remove the vestages of maintaining main_class through
      *          the environment (and remove these comments).
      */
-    if (jarfile != 0) {
-        mainClass = LoadMainClass(env, JNI_TRUE, jarfile);
-    } else {
-        mainClass = LoadMainClass(env, JNI_FALSE, classname);
-    }
+    mainClass = LoadMainClass(env, mode, what);
     CHECK_EXCEPTION_NULL_LEAVE(mainClass);
 
     /*
@@ -712,7 +716,7 @@
     if (JLI_StrCCmp(str, "-Xms") == 0) {
         jlong tmp;
         if (parse_size(str + 4, &tmp)) {
-            initialHeapSize = tmp;
+           initialHeapSize = tmp;
         }
     }
 }
@@ -734,44 +738,6 @@
 }
 
 /*
- * Set the bootclasspath for modules.
- * A temporary workaround until jigsaw is integrated into JDK 7.
- */
-static void
-SetModulesBootClassPath(const char *jrepath)
-{
-    char *def, *s;
-    char pathname[MAXPATHLEN];
-    const char separator[] = { FILE_SEPARATOR, '\0' };
-    const char *orig = jrepath;
-    static const char format[] = "-Xbootclasspath/p:%s";
-    struct stat statbuf;
-
-    /* return if jre/lib/rt.jar exists */
-    JLI_Snprintf(pathname, sizeof(pathname), "%s%slib%srt.jar", jrepath, separator, separator);
-    if (stat(pathname, &statbuf) == 0) {
-        return;
-    }
-
-    /* return if jre/classes exists */
-    JLI_Snprintf(pathname, sizeof(pathname), "%s%sclasses", jrepath, separator);
-    if (stat(pathname, &statbuf) == 0) {
-        return;
-    }
-
-    /* modularized jre */
-    JLI_Snprintf(pathname, sizeof(pathname), "%s%slib%s*", jrepath, separator, separator);
-    s = (char *) JLI_WildcardExpandClasspath(pathname);
-    def = JLI_MemAlloc(sizeof(format)
-                       - 2 /* strlen("%s") */
-                       + JLI_StrLen(s));
-    sprintf(def, format, s);
-    AddOption(def, NULL);
-    if (s != orig)
-        JLI_MemFree((char *) s);
-}
-
-/*
  * The SelectVersion() routine ensures that an appropriate version of
  * the JRE is running.  The specification for the appropriate version
  * is obtained from either the manifest of a jar file (preferred) or
@@ -1015,16 +981,17 @@
 /*
  * Parses command line arguments.  Returns JNI_FALSE if launcher
  * should exit without starting vm, returns JNI_TRUE if vm needs
- * to be started to process  given options. *pret (the launcher
+ * to be started to process given options.  *pret (the launcher
  * process return value) is set to 0 for a normal exit.
  */
 static jboolean
-ParseArguments(int *pargc, char ***pargv, char **pjarfile,
-                       char **pclassname, int *pret, const char *jvmpath)
+ParseArguments(int *pargc, char ***pargv,
+               int *pmode, char **pwhat,
+               int *pret, const char *jrepath)
 {
     int argc = *pargc;
     char **argv = *pargv;
-    jboolean jarflag = JNI_FALSE;
+    int mode = LM_UNKNOWN;
     char *arg;
 
     *pret = 0;
@@ -1034,10 +1001,11 @@
         if (JLI_StrCmp(arg, "-classpath") == 0 || JLI_StrCmp(arg, "-cp") == 0) {
             ARG_CHECK (argc, ARG_ERROR1, arg);
             SetClassPath(*argv);
+            mode = LM_CLASS;
             argv++; --argc;
         } else if (JLI_StrCmp(arg, "-jar") == 0) {
             ARG_CHECK (argc, ARG_ERROR2, arg);
-            jarflag = JNI_TRUE;
+            mode = LM_JAR;
         } else if (JLI_StrCmp(arg, "-help") == 0 ||
                    JLI_StrCmp(arg, "-h") == 0 ||
                    JLI_StrCmp(arg, "-?") == 0) {
@@ -1064,6 +1032,8 @@
         } else if (JLI_StrCmp(arg, "-XshowSettings") == 0 ||
                 JLI_StrCCmp(arg, "-XshowSettings:") == 0) {
             showSettings = arg;
+        } else if (JLI_StrCmp(arg, "-Xdiag") == 0) {
+            AddOption("-Dsun.java.launcher.diag=true", NULL);
 /*
  * The following case provide backward compatibility with old-style
  * command line options.
@@ -1123,19 +1093,24 @@
     }
 
     if (--argc >= 0) {
-        if (jarflag) {
-            *pjarfile = *argv++;
-            *pclassname = NULL;
-        } else {
-            *pjarfile = NULL;
-            *pclassname = *argv++;
-        }
+        *pwhat = *argv++;
+    }
+
+    if (*pwhat == NULL) {
+        *pret = 1;
+    } else if (mode == LM_UNKNOWN) {
+        /* default to LM_CLASS if -jar and -cp option are
+         * not specified */
+        mode = LM_CLASS;
+    }
+
+    if (argc >= 0) {
         *pargc = argc;
         *pargv = argv;
     }
-    if (*pjarfile == NULL && *pclassname == NULL) {
-        *pret = 1;
-    }
+
+    *pmode = mode;
+
     return JNI_TRUE;
 }
 
@@ -1284,7 +1259,7 @@
  * call it for more details refer to the java implementation.
  */
 static jclass
-LoadMainClass(JNIEnv *env, jboolean isJar, char *name)
+LoadMainClass(JNIEnv *env, int mode, char *name)
 {
     jclass cls;
     jmethodID mid;
@@ -1297,9 +1272,9 @@
     }
     NULL_CHECK0(cls = FindBootStrapClass(env, "sun/launcher/LauncherHelper"));
     NULL_CHECK0(mid = (*env)->GetStaticMethodID(env, cls, "checkAndLoadMain",
-                                          "(ZZLjava/lang/String;)Ljava/lang/Object;"));
+                                          "(ZILjava/lang/String;)Ljava/lang/Class;"));
     str = (*env)->NewStringUTF(env, name);
-    result = (*env)->CallStaticObjectMethod(env, cls, mid, JNI_TRUE, isJar, str);
+    result = (*env)->CallStaticObjectMethod(env, cls, mid, JNI_TRUE, mode, str);
 
     if (JLI_IsTraceLauncher()) {
         end   = CounterGet();
@@ -1445,8 +1420,7 @@
  * property is not exported by HotSpot to the Java layer.
  */
 void
-SetJavaCommandLineProp(char *classname, char *jarfile,
-                       int argc, char **argv)
+SetJavaCommandLineProp(char *what, int argc, char **argv)
 {
 
     int i = 0;
@@ -1454,22 +1428,17 @@
     char* javaCommand = NULL;
     char* dashDstr = "-Dsun.java.command=";
 
-    if (classname == NULL && jarfile == NULL) {
+    if (what == NULL) {
         /* unexpected, one of these should be set. just return without
          * setting the property
          */
         return;
     }
 
-    /* if the class name is not set, then use the jarfile name */
-    if (classname == NULL) {
-        classname = jarfile;
-    }
-
     /* determine the amount of memory to allocate assuming
      * the individual components will be space separated
      */
-    len = JLI_StrLen(classname);
+    len = JLI_StrLen(what);
     for (i = 0; i < argc; i++) {
         len += JLI_StrLen(argv[i]) + 1;
     }
@@ -1480,7 +1449,7 @@
     /* build the -D string */
     *javaCommand = '\0';
     JLI_StrCat(javaCommand, dashDstr);
-    JLI_StrCat(javaCommand, classname);
+    JLI_StrCat(javaCommand, what);
 
     for (i = 0; i < argc; i++) {
         /* the components of the string are space separated. In
@@ -1500,7 +1469,8 @@
  * JVM would like to know if it's created by a standard Sun launcher, or by
  * user native application, the following property indicates the former.
  */
-void SetJavaLauncherProp() {
+void
+SetJavaLauncherProp() {
   AddOption("-Dsun.java.launcher=SUN_STANDARD", NULL);
 }
 
@@ -1934,8 +1904,8 @@
 }
 
 static int
-ContinueInNewThread(InvocationFunctions* ifn, int argc,
-                     char **argv, char *jarfile, char *classname, int ret)
+ContinueInNewThread(InvocationFunctions* ifn, int argc, char **argv,
+                    int mode, char *what, int ret)
 {
 
     /*
@@ -1959,8 +1929,8 @@
 
       args.argc = argc;
       args.argv = argv;
-      args.jarfile = jarfile;
-      args.classname = classname;
+      args.mode = mode;
+      args.what = what;
       args.ifn = *ifn;
 
       rslt = ContinueInNewThread0(JavaMain, threadStackSize, (void*)&args);
--- a/src/share/bin/java.h	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/bin/java.h	Sun Feb 20 12:46:58 2011 -0800
@@ -153,7 +153,7 @@
 
 /* sun.java.launcher.* platform properties. */
 void SetJavaLauncherPlatformProps(void);
-void SetJavaCommandLineProp(char* classname, char* jarfile, int argc, char** argv);
+void SetJavaCommandLineProp(char* what, int argc, char** argv);
 void SetJavaLauncherProp(void);
 
 /*
@@ -178,8 +178,9 @@
 
 jboolean ServerClassMachine();
 
-static int ContinueInNewThread(InvocationFunctions* ifn, int argc, char** argv,
-                        char* jarfile, char* classname, int ret);
+static int ContinueInNewThread(InvocationFunctions* ifn,
+                               int argc, char** argv,
+                               int mode, char *what, int ret);
 
 /*
  * Initialize platform specific settings
--- a/src/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -13,72 +13,72 @@
 #
 # accessible roles
 #
-alert=Warnmeldung
+alert=Alert
 awtcomponent=AWT-Komponente
-checkbox=Kontrollk\u00e4stchen
+checkbox=Kontrollk\u00E4stchen
 colorchooser=Farbauswahl
-columnheader=Spaltenkopf
+columnheader=Spalten-Header
 combobox=Kombinationsfeld
 canvas=Leinwand
-desktopicon=Desktop-Symbol
-desktoppane=Desktop-Bereich
+desktopicon=Desktopsymbol
+desktoppane=Desktopbereich
 dialog=Dialogfeld
 directorypane=Verzeichnisbereich
-glasspane=Glasbereich
+glasspane=Glass Pane
 filechooser=Dateiauswahl
-filler=F\u00fcllbereich
+filler=F\u00FCllbereich
 frame=Rahmen
 internalframe=Innerer Rahmen
-label=Beschriftung
-layeredpane=\u00dcberlagertes Teilfenster
+label=Label
+layeredpane=Layered Pane
 list=Liste
 listitem=Listenelement
-menubar=Men\u00fcleiste
-menu=Men\u00fc
-menuitem=Men\u00fceintrag
+menubar=Men\u00FCleiste
+menu=Men\u00FC
+menuitem=Men\u00FCpunkt
 optionpane=Optionsbereich
 pagetab=Registerkarte
-pagetablist=Register
-panel=Steuerbereich
-passwordtext=Passworttext
-popupmenu=Popup-Men\u00fc
-progressbar=Fortschrittsanzeige
-pushbutton=Schaltfl\u00e4che
+pagetablist=Registerkartenliste
+panel=Bereich
+passwordtext=Kennworttext
+popupmenu=Popup-Men\u00FC
+progressbar=Fortschrittsbalken
+pushbutton=Schaltfl\u00E4che
 radiobutton=Optionsfeld
 rootpane=Root-Bereich
-rowheader=Zeilenkopf
+rowheader=Zeilen-Header
 scrollbar=Bildlaufleiste
 scrollpane=Bildlaufbereich
 separator=Trennzeichen
 slider=Schieberegler
-splitpane=Geteilter Anzeigebereich
+splitpane=Split Pane
 swingcomponent=Swing-Komponente
 table=Tabelle
 text=Text
 tree=Baumstruktur
-togglebutton=Umschaltfl\u00e4che
+togglebutton=Umschaltfl\u00E4che
 toolbar=Symbolleiste
 tooltip=QuickInfo
 unknown=Unbekannt
-viewport=Anzeigeschnittstelle
+viewport=Viewport
 window=Fenster
 #
 # accessible relations
 #
-labelFor=Beschriftung f\u00fcr
+labelFor=Label f\u00FCr
 labeledBy=beschriftet von
 memberOf=Mitglied von
-controlledBy=Gesteuert von
-controllerFor=Steuerung f\u00fcr
+controlledBy=controlledBy
+controllerFor=controllerFor
 #
 # accessible states
 #
 active=aktiv
 armed=aktiviert
-busy=belegt
+busy=ausgelastet
 checked=markiert
 collapsed=ausgeblendet
-editable=editierbar
+editable=bearbeitbar
 expandable=erweiterbar
 expanded=eingeblendet
 enabled=aktiviert
@@ -87,15 +87,15 @@
 iconified=minimiert
 modal=modal
 multiline=mehrzeilig
-multiselectable=mehrfach ausw\u00e4hlbar
-opaque=verdeckt
-pressed=gedr\u00fcckt
+multiselectable=mehrfach ausw\u00E4hlbar
+opaque=nicht transparent
+pressed=gedr\u00FCckt
 resizable=skalierbar
-selectable=w\u00e4hlbar
-selected=ausgew\u00e4hlt
+selectable=w\u00E4hlbar
+selected=ausgew\u00E4hlt
 showing=angezeigt
 singleline=einzeilig
-transient=tempor\u00e4r
+transient=transient
 visible=sichtbar
 vertical=vertikal
 horizontal=horizontal
@@ -109,10 +109,10 @@
 # 
 # accessible relations
 #
-flowsTo=flie\u00dft zu
-flowsFrom=flie\u00dft von
+flowsTo=flie\u00DFt zu
+flowsFrom=flie\u00DFt von
 subwindowOf=Unterfenster von
-parentWindowOf=\u00fcbergeordnetes Fenster von
+parentWindowOf=\u00FCbergeordnetes Fenster von
 embeds=bettet ein
 embeddedBy=eingebettet in
 childNodeOf=untergeordneter Knoten von
@@ -120,8 +120,8 @@
 #
 # accessible roles
 #
-header=Kopfzeile
-footer=Fu\u00dfzeile
+header=Header
+footer=Footer
 paragraph=Absatz
 ruler=Lineal
 editbar=Bearbeitungsleiste
@@ -130,9 +130,9 @@
 #
 # accessible states
 #
-managesDescendants=verwaltet abgeleitete Objekte
+managesDescendants=verwaltet untergeordnete Objekte
 indeterminate=unbestimmt
-truncated=gek\u00fcrzt
+truncated=abgeschnitten
 
 # new for J2SE 1.6.0
 
--- a/src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -14,53 +14,53 @@
 # accessible roles
 #
 alert=alerta
-awtcomponent=Componente AWT
-checkbox=casilla de verificaci\u00f3n
+awtcomponent=componente AWT
+checkbox=casilla de control
 colorchooser=selector de color
 columnheader=cabecera de columna
 combobox=cuadro combinado
-canvas=superficie
+canvas=lienzo
 desktopicon=icono de escritorio
-desktoppane=tablero de escritorio
-dialog=cuadro de di\u00e1logo
-directorypane=tablero de directorio
-glasspane=tablero de cristal
+desktoppane=panel de escritorio
+dialog=cuadro de di\u00E1logo
+directorypane=panel de directorio
+glasspane=panel de cristal
 filechooser=selector de archivos
 filler=rellenador
 frame=marco
 internalframe=marco interno
 label=etiqueta
-layeredpane=tablero en capas
+layeredpane=panel en capas
 list=lista
 listitem=elemento de lista
-menubar=barra de men\u00fas
-menu=men\u00fa
-menuitem=elemento de men\u00fa
-optionpane=tablero de opciones
-pagetab=pesta\u00f1a de p\u00e1gina
-pagetablist=lista de pesta\u00f1as de p\u00e1gina
+menubar=barra de men\u00FAs
+menu=men\u00FA
+menuitem=elemento de men\u00FA
+optionpane=panel de opciones
+pagetab=separador de p\u00E1gina
+pagetablist=lista de separadores de p\u00E1gina
 panel=panel
-passwordtext=texto de contrase\u00f1a
-popupmenu=men\u00fa emergente
+passwordtext=texto de contrase\u00F1a
+popupmenu=men\u00FA emergente
 progressbar=barra de progreso
-pushbutton=bot\u00f3n de acci\u00f3n
-radiobutton=bot\u00f3n de radio
-rootpane=tablero ra\u00edz
+pushbutton=bot\u00F3n
+radiobutton=bot\u00F3n de radio
+rootpane=panel ra\u00EDz
 rowheader=cabecera de filas
 scrollbar=barra de desplazamiento
-scrollpane=tablero de desplazamiento
+scrollpane=panel de desplazamiento
 separator=separador
 slider=deslizador
-splitpane=tablero de divisi\u00f3n
+splitpane=panel de divisi\u00F3n
 swingcomponent=componente swing
 table=tabla
 text=texto
-tree=\u00e1rbol
-togglebutton=bot\u00f3n conmutador
+tree=\u00E1rbol
+togglebutton=bot\u00F3n conmutador
 toolbar=barra de herramientas
-tooltip=consejo de herramienta
+tooltip=ayuda de burbuja
 unknown=desconocido
-viewport=puerto de vista
+viewport=viewport
 window=ventana
 #
 # accessible relations
@@ -68,25 +68,25 @@
 labelFor=etiqueta para
 labeledBy=etiquetado por
 memberOf=miembro de
-controlledBy=controlado por
-controllerFor=controlador de
+controlledBy=controlledBy
+controllerFor=controllerFor
 #
 # accessible states
 #
 active=activo
 armed=armado
 busy=ocupado
-checked=marcado
-collapsed=contra\u00eddo
+checked=activado
+collapsed=reducido
 editable=editable
 expandable=ampliable
 expanded=ampliado
-enabled=habilitado
+enabled=activado
 focusable=enfocable
 focused=enfocado
 iconified=convertido en icono
 modal=modal
-multiline=l\u00ednea m\u00faltiple
+multiline=l\u00EDnea m\u00FAltiple
 multiselectable=multiseleccionable
 opaque=opaco
 pressed=pulsado
@@ -94,15 +94,15 @@
 selectable=seleccionable
 selected=seleccionado
 showing=mostrando
-singleline=l\u00ednea \u00fanica
-transient=temporal
+singleline=l\u00EDnea \u00FAnica
+transient=transitorio
 visible=visible
 vertical=vertical
 horizontal=horizontal
 #
 # accessible actions
 #
-toggle expand=activar/desactivar ampliaci\u00f3n
+toggle expand=activar/desactivar ampliaci\u00F3n
 
 # new relations, roles and states for J2SE 1.5.0
 
@@ -112,9 +112,9 @@
 flowsTo=llega a
 flowsFrom=procede de
 subwindowOf=ventana subordinada de
-parentWindowOf=ventana superior de
-embeds=incluye
-embeddedBy=se incluye en
+parentWindowOf=ventana principal de
+embeds=embebe
+embeddedBy=embebido por
 childNodeOf=nodo secundario de
 
 #
@@ -122,15 +122,15 @@
 #
 header=cabecera
 footer=pie
-paragraph=p\u00e1rrafo
+paragraph=p\u00E1rrafo
 ruler=regla
-editbar=barra de edici\u00f3n
-progressMonitor=monitor de progresi\u00f3n
+editbar=barra de edici\u00F3n
+progressMonitor=monitor de progreso
 
 #
 # accessible states
 #
-managesDescendants=gestiona objetos subordinados
+managesDescendants=gestiona descendientes
 indeterminate=indeterminado
 truncated=truncado
 
--- a/src/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -14,95 +14,95 @@
 # accessible roles
 #
 alert=alerte
-awtcomponent=Composant AWT
-checkbox=case \u00e0 cocher
-colorchooser=s\u00e9lecteur de couleurs
-columnheader=en-t\u00eate de colonne
-combobox=bo\u00eete de dialogue mixte
+awtcomponent=composant AWT
+checkbox=case \u00E0 cocher
+colorchooser=s\u00E9lecteur de couleurs
+columnheader=en-t\u00EAte de colonne
+combobox=liste d\u00E9roulante
 canvas=canevas
-desktopicon=ic\u00f4ne de bureau
-desktoppane=sous-fen\u00eatre de bureau
-dialog=bo\u00eete de dialogue
-directorypane=sous-fen\u00eatre de r\u00e9pertoires
-glasspane=sous-fen\u00eatre de grossissement
-filechooser=s\u00e9lecteur de fichiers
-filler=\u00e9l\u00e9ment de remplissage
+desktopicon=ic\u00F4ne de bureau
+desktoppane=panneau de bureau
+dialog=bo\u00EEte de dialogue
+directorypane=panneau de r\u00E9pertoires
+glasspane=panneau de grossissement
+filechooser=s\u00E9lecteur de fichiers
+filler=\u00E9l\u00E9ment de remplissage
 frame=cadre
 internalframe=cadre interne
-label=\u00e9tiquette
-layeredpane=sous-fen\u00eatre superpos\u00e9e
+label=libell\u00E9
+layeredpane=panneau superpos\u00E9
 list=liste
-listitem=\u00e9l\u00e9ment de liste
+listitem=\u00E9l\u00E9ment de liste
 menubar=barre de menus
 menu=menu
 menuitem=option de menu
-optionpane=sous-fen\u00eatre d''options
+optionpane=panneau d'options
 pagetab=onglet de page
-pagetablist=liste d''onglets de page
+pagetablist=liste d'onglets de page
 panel=panneau
 passwordtext=texte de mot de passe
 popupmenu=menu contextuel
 progressbar=barre de progression
-pushbutton=bouton poussoir
+pushbutton=bouton
 radiobutton=bouton radio
-rootpane=sous-fen\u00eatre racine
-rowheader=en-t\u00eate de ligne
-scrollbar=barre de d\u00e9filement
-scrollpane=sous-fen\u00eatre de d\u00e9filement
-separator=s\u00e9parateur
+rootpane=panneau racine
+rowheader=en-t\u00EAte de ligne
+scrollbar=barre de d\u00E9filement
+scrollpane=panneau de d\u00E9filement
+separator=s\u00E9parateur
 slider=curseur
-splitpane=sous-fen\u00eatre divis\u00e9e
-swingcomponent=composant de bascule
+splitpane=panneau divis\u00E9
+swingcomponent=composant Swing
 table=tableau
 text=texte
-tree=arbre
+tree=arborescence
 togglebutton=bouton de basculement
-toolbar=barre d''outils
+toolbar=barre d'outils
 tooltip=info-bulle
 unknown=inconnu
-viewport=cl\u00f4ture
-window=fen\u00eatre
+viewport=lucarne
+window=fen\u00EAtre
 #
 # accessible relations
 #
-labelFor=\u00e9tiquette de
-labeledBy=libell\u00e9(e) par
+labelFor=libell\u00E9 de
+labeledBy=libell\u00E9 par
 memberOf=membre de
-controlledBy=contr\u00f4l\u00e9 par
-controllerFor=contr\u00f4leur pour
+controlledBy=contr\u00F4l\u00E9 par
+controllerFor=contr\u00F4leur pour
 #
 # accessible states
 #
-active=actif(ve)
-armed=arm\u00e9(e)
-busy=occup\u00e9(e)
-checked=coch\u00e9e
-collapsed=r\u00e9duit(e)
+active=actif
+armed=arm\u00E9
+busy=occup\u00E9
+checked=coch\u00E9
+collapsed=r\u00E9duit
 editable=modifiable
 expandable=extensible
-expanded=d\u00e9velopp\u00e9(e)
-enabled=activ\u00e9(e)
-focusable=zone d''entr\u00e9e possible
-focused=avec zone d''entr\u00e9e
-iconified=r\u00e9duit(e) \u00e0 une ic\u00f4ne
-modal=modal(e)
+expanded=d\u00E9velopp\u00E9
+enabled=activ\u00E9
+focusable=zone d'entr\u00E9e possible
+focused=avec zone d'entr\u00E9e
+iconified=r\u00E9duit \u00E0 une ic\u00F4ne
+modal=modal
 multiline=ligne multiple
-multiselectable=multis\u00e9lectionnable
+multiselectable=multis\u00E9lectionnable
 opaque=opaque
-pressed=enfonc\u00e9
+pressed=enfonc\u00E9
 resizable=redimensionnable
-selectable=s\u00e9lectionnable
-selected=s\u00e9lectionn\u00e9(e)
+selectable=s\u00E9lectionnable
+selected=s\u00E9lectionn\u00E9
 showing=montrant
 singleline=ligne unique
-transient=transitoire
+transient=non persistant
 visible=visible
-vertical=vertical(e)
-horizontal=horizontal(e)
+vertical=vertical
+horizontal=horizontal
 #
 # accessible actions
 #
-toggle expand=basculer le d\u00e9veloppement
+toggle expand=basculer le d\u00E9veloppement
 
 # new relations, roles and states for J2SE 1.5.0
 
@@ -111,35 +111,35 @@
 #
 flowsTo=flux vers
 flowsFrom=flux depuis
-subwindowOf=sous-fen\u00eatre de
-parentWindowOf=fen\u00eatre parente de
+subwindowOf=sous-fen\u00EAtre de
+parentWindowOf=fen\u00EAtre parente de
 embeds=incorpore
-embeddedBy=incorpor\u00e9 par
-childNodeOf=n\u0153ud enfant de
+embeddedBy=incorpor\u00E9 par
+childNodeOf=noeud enfant de
 
 #
 # accessible roles
 #
-header=en-t\u00eate
+header=en-t\u00EAte
 footer=pied de page
 paragraph=paragraphe
-ruler=r\u00e8gle
-editbar=barre d'\u00e9dition
-progressMonitor=contr\u00f4le de la progression
+ruler=r\u00E8gle
+editbar=barre d'\u00E9dition
+progressMonitor=contr\u00F4le de la progression
 
 #
 # accessible states
 #
-managesDescendants=g\u00e8re les descendants
-indeterminate=ind\u00e9termin\u00e9
-truncated=tronqu\u00e9
+managesDescendants=g\u00E8re les descendants
+indeterminate=ind\u00E9termin\u00E9
+truncated=tronqu\u00E9
 
 # new for J2SE 1.6.0
 
 #
 # accessible roles
 #
-htmlcontainer=Conteneur HTML
+htmlcontainer=conteneur HTML
 
 #
 # END OF MATERIAL TO LOCALIZE
--- a/src/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -13,45 +13,45 @@
 #
 # accessible roles
 #
-alert=allarme
+alert=avviso
 awtcomponent=componente AWT
 checkbox=casella di controllo
 colorchooser=selezione colori
 columnheader=intestazione colonna
-combobox=casella
-canvas=area di disegno
-desktopicon=icona del desktop
-desktoppane=sottofinestra del desktop
+combobox=casella combinata
+canvas=sfondo
+desktopicon=icona desktop
+desktoppane=riquadro desktop
 dialog=finestra di dialogo
-directorypane=sottofinestra della directory
-glasspane=sottofinestra trasparente
+directorypane=riquadro directory
+glasspane=riquadro trasparente
 filechooser=selezione file
-filler=utilit\u00e0 riempimento
+filler=utilit\u00E0 riempimento
 frame=cornice
 internalframe=cornice interna
 label=etichetta
-layeredpane=sottofinestra a livelli
-list=elenco
-listitem=voce di elenco
+layeredpane=riquadro a livelli
+list=lista
+listitem=voce lista
 menubar=barra dei menu
 menu=menu
 menuitem=voce di menu
-optionpane=sottofinestra delle opzioni
+optionpane=riquadro opzioni
 pagetab=scheda pagina
-pagetablist=elenco schede pagina
+pagetablist=lista schede pagina
 panel=pannello
 passwordtext=testo della password
-popupmenu=menu a comparsa
+popupmenu=menu popup
 progressbar=barra di avanzamento
 pushbutton=pulsante
 radiobutton=pulsante di scelta
-rootpane=sottofinestra root
+rootpane=riquadro root
 rowheader=intestazione di riga
 scrollbar=barra di scorrimento
-scrollpane=scorri sottofinestra
+scrollpane=riquadro scorrimento
 separator=separatore
-slider=cursore
-splitpane=sottofinestra doppia
+slider=dispositivo di scorrimento
+splitpane=riquadro doppio
 swingcomponent=componente swing
 table=tabella
 text=testo
@@ -68,8 +68,8 @@
 labelFor=etichetta per
 labeledBy=etichetta di
 memberOf=membro di
-controlledBy=controllato da
-controllerFor=controllore per
+controlledBy=controlledBy
+controllerFor=controllerFor
 #
 # accessible states
 #
@@ -77,11 +77,11 @@
 armed=abilitato
 busy=occupato
 checked=verificato
-collapsed=ingrandito
+collapsed=compresso
 editable=modificabile
 expandable=espandibile
 expanded=espanso
-enabled=attivato
+enabled=abilitato
 focusable=attivabile in primo piano
 focused=in primo piano
 iconified=ridotto a icona
@@ -121,7 +121,7 @@
 # accessible roles
 #
 header=intestazione
-footer=pi\u00e8 di pagina
+footer=pi\u00E8 di pagina
 paragraph=paragrafo
 ruler=righello
 editbar=barra di modifica
--- a/src/share/classes/com/sun/accessibility/internal/resources/accessibility_ja.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/accessibility/internal/resources/accessibility_ja.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -13,133 +13,133 @@
 #
 # accessible roles
 #
-alert=\u8b66\u544a
-awtcomponent=AWT \u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8
-checkbox=\u30c1\u30a7\u30c3\u30af\u30dc\u30c3\u30af\u30b9
-colorchooser=\u30ab\u30e9\u30fc\u30c1\u30e5\u30fc\u30b6
-columnheader=\u5217\u30d8\u30c3\u30c0
-combobox=\u30b3\u30f3\u30dc\u30dc\u30c3\u30af\u30b9
-canvas=\u30ad\u30e3\u30f3\u30d0\u30b9
-desktopicon=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30a2\u30a4\u30b3\u30f3
-desktoppane=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u533a\u753b
-dialog=\u30c0\u30a4\u30a2\u30ed\u30b0
-directorypane=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u533a\u753b
-glasspane=\u30ac\u30e9\u30b9\u533a\u753b
-filechooser=\u30d5\u30a1\u30a4\u30eb\u30c1\u30e5\u30fc\u30b6
-filler=\u30d5\u30a3\u30e9\u30fc
-frame=\u30d5\u30ec\u30fc\u30e0
-internalframe=\u5185\u90e8\u30d5\u30ec\u30fc\u30e0
-label=\u30e9\u30d9\u30eb
-layeredpane=\u968e\u5c64\u5316\u3055\u308c\u305f\u533a\u753b
-list=\u30ea\u30b9\u30c8
-listitem=\u30ea\u30b9\u30c8\u9805\u76ee
-menubar=\u30e1\u30cb\u30e5\u30fc\u30d0\u30fc
-menu=\u30e1\u30cb\u30e5\u30fc
-menuitem=\u30e1\u30cb\u30e5\u30fc\u9805\u76ee
-optionpane=\u30aa\u30d7\u30b7\u30e7\u30f3\u533a\u753b
-pagetab=\u30da\u30fc\u30b8\u30bf\u30d6
-pagetablist=\u30da\u30fc\u30b8\u30bf\u30d6\u30ea\u30b9\u30c8
-panel=\u30d1\u30cd\u30eb
-passwordtext=\u30d1\u30b9\u30ef\u30fc\u30c9\u30c6\u30ad\u30b9\u30c8
-popupmenu=\u30dd\u30c3\u30d7\u30a2\u30c3\u30d7\u30e1\u30cb\u30e5\u30fc
-progressbar=\u9032\u6357\u30d0\u30fc
-pushbutton=\u30d7\u30c3\u30b7\u30e5\u30dc\u30bf\u30f3
-radiobutton=\u30e9\u30b8\u30aa\u30dc\u30bf\u30f3
-rootpane=\u30eb\u30fc\u30c8\u533a\u753b
-rowheader=\u884c\u30d8\u30c3\u30c0
-scrollbar=\u30b9\u30af\u30ed\u30fc\u30eb\u30d0\u30fc
-scrollpane=\u30b9\u30af\u30ed\u30fc\u30eb\u533a\u753b
-separator=\u30bb\u30d1\u30ec\u30fc\u30bf
-slider=\u30b9\u30e9\u30a4\u30c0
-splitpane=\u5206\u5272\u533a\u753b
-swingcomponent=Swing \u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8
-table=\u30c6\u30fc\u30d6\u30eb
-text=\u30c6\u30ad\u30b9\u30c8
-tree=\u30c4\u30ea\u30fc
-togglebutton=\u30c8\u30b0\u30eb\u30dc\u30bf\u30f3
-toolbar=\u30c4\u30fc\u30eb\u30d0\u30fc
-tooltip=\u30c4\u30fc\u30eb\u30d2\u30f3\u30c8
-unknown=\u672a\u77e5
-viewport=\u30d3\u30e5\u30fc\u30dd\u30fc\u30c8
-window=\u30a6\u30a3\u30f3\u30c9\u30a6
+alert=\u30A2\u30E9\u30FC\u30C8
+awtcomponent=AWT\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8
+checkbox=\u30C1\u30A7\u30C3\u30AF\u30FB\u30DC\u30C3\u30AF\u30B9
+colorchooser=\u30AB\u30E9\u30FC\u30FB\u30C1\u30E5\u30FC\u30B6
+columnheader=\u5217\u30D8\u30C3\u30C0\u30FC
+combobox=\u30B3\u30F3\u30DC\u30FB\u30DC\u30C3\u30AF\u30B9
+canvas=\u30AD\u30E3\u30F3\u30D0\u30B9
+desktopicon=\u30C7\u30B9\u30AF\u30C8\u30C3\u30D7\u30FB\u30A2\u30A4\u30B3\u30F3
+desktoppane=\u30C7\u30B9\u30AF\u30C8\u30C3\u30D7\u533A\u753B
+dialog=\u30C0\u30A4\u30A2\u30ED\u30B0
+directorypane=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u533A\u753B
+glasspane=\u30AC\u30E9\u30B9\u533A\u753B
+filechooser=\u30D5\u30A1\u30A4\u30EB\u30FB\u30C1\u30E5\u30FC\u30B6
+filler=\u30D5\u30A3\u30E9\u30FC
+frame=\u30D5\u30EC\u30FC\u30E0
+internalframe=\u5185\u90E8\u30D5\u30EC\u30FC\u30E0
+label=\u30E9\u30D9\u30EB
+layeredpane=\u968E\u5C64\u5316\u3055\u308C\u305F\u533A\u753B
+list=\u30EA\u30B9\u30C8
+listitem=\u30EA\u30B9\u30C8\u9805\u76EE
+menubar=\u30E1\u30CB\u30E5\u30FC\u30FB\u30D0\u30FC
+menu=\u30E1\u30CB\u30E5\u30FC
+menuitem=\u30E1\u30CB\u30E5\u30FC\u9805\u76EE
+optionpane=\u30AA\u30D7\u30B7\u30E7\u30F3\u533A\u753B
+pagetab=\u30DA\u30FC\u30B8\u30FB\u30BF\u30D6
+pagetablist=\u30DA\u30FC\u30B8\u30FB\u30BF\u30D6\u30FB\u30EA\u30B9\u30C8
+panel=\u30D1\u30CD\u30EB
+passwordtext=\u30D1\u30B9\u30EF\u30FC\u30C9\u30FB\u30C6\u30AD\u30B9\u30C8
+popupmenu=\u30DD\u30C3\u30D7\u30A2\u30C3\u30D7\u30FB\u30E1\u30CB\u30E5\u30FC
+progressbar=\u9032\u6357\u30D0\u30FC
+pushbutton=\u30D7\u30C3\u30B7\u30E5\u30FB\u30DC\u30BF\u30F3
+radiobutton=\u30E9\u30B8\u30AA\u30FB\u30DC\u30BF\u30F3
+rootpane=\u30EB\u30FC\u30C8\u533A\u753B
+rowheader=\u884C\u30D8\u30C3\u30C0\u30FC
+scrollbar=\u30B9\u30AF\u30ED\u30FC\u30EB\u30FB\u30D0\u30FC
+scrollpane=\u30B9\u30AF\u30ED\u30FC\u30EB\u533A\u753B
+separator=\u30BB\u30D1\u30EC\u30FC\u30BF
+slider=\u30B9\u30E9\u30A4\u30C0
+splitpane=\u5206\u5272\u533A\u753B
+swingcomponent=Swing\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8
+table=\u8868
+text=\u30C6\u30AD\u30B9\u30C8
+tree=\u30C4\u30EA\u30FC
+togglebutton=\u30C8\u30B0\u30EB\u30FB\u30DC\u30BF\u30F3
+toolbar=\u30C4\u30FC\u30EB\u30D0\u30FC
+tooltip=\u30C4\u30FC\u30EB\u30C1\u30C3\u30D7
+unknown=\u4E0D\u660E
+viewport=\u30D3\u30E5\u30FC\u30DD\u30FC\u30C8
+window=\u30A6\u30A3\u30F3\u30C9\u30A6
 #
 # accessible relations
 #
-labelFor=\u30e9\u30d9\u30eb\u5143
-labeledBy=\u30e9\u30d9\u30eb\u5148
-memberOf=\u6240\u5c5e\u30e1\u30f3\u30d0
-controlledBy=\u5236\u5fa1\u5bfe\u8c61
-controllerFor=\u5236\u5fa1\u5143
+labelFor=label for
+labeledBy=labeled by
+memberOf=member of
+controlledBy=controlledBy
+controllerFor=controllerFor
 #
 # accessible states
 #
-active=\u30a2\u30af\u30c6\u30a3\u30d6
-armed=\u4f5c\u52d5\u6e96\u5099\u5b8c\u4e86
-busy=\u30d3\u30b8\u30fc
-checked=\u30c1\u30a7\u30c3\u30af
-collapsed=\u77ed\u7e2e
-editable=\u7de8\u96c6\u53ef\u80fd
-expandable=\u5c55\u958b\u53ef\u80fd
-expanded=\u5c55\u958b
-enabled=\u6709\u52b9
-focusable=\u30d5\u30a9\u30fc\u30ab\u30b9\u53ef\u80fd
-focused=\u30d5\u30a9\u30fc\u30ab\u30b9
-iconified=\u30a2\u30a4\u30b3\u30f3\u5316
-modal=\u30e2\u30fc\u30c0\u30eb
-multiline=\u8907\u6570\u884c
-multiselectable=\u8907\u6570\u9078\u629e\u53ef\u80fd
-opaque=\u4e0d\u900f\u660e
-pressed=\u62bc\u4e0b
-resizable=\u30b5\u30a4\u30ba\u5909\u66f4\u53ef\u80fd
-selectable=\u9078\u629e\u53ef\u80fd
-selected=\u9078\u629e
-showing=\u8868\u793a
-singleline=\u5358\u4e00\u884c
-transient=\u4e00\u6642
-visible=\u53ef\u8996
-vertical=\u5782\u76f4
-horizontal=\u6c34\u5e73
+active=\u30A2\u30AF\u30C6\u30A3\u30D6
+armed=\u4F5C\u52D5\u6E96\u5099\u5B8C\u4E86
+busy=\u30D3\u30B8\u30FC
+checked=\u30C1\u30A7\u30C3\u30AF
+collapsed=\u77ED\u7E2E
+editable=\u7DE8\u96C6\u53EF\u80FD
+expandable=\u5C55\u958B\u53EF\u80FD
+expanded=\u5C55\u958B
+enabled=\u6709\u52B9
+focusable=\u30D5\u30A9\u30FC\u30AB\u30B9\u53EF\u80FD
+focused=\u30D5\u30A9\u30FC\u30AB\u30B9
+iconified=\u30A2\u30A4\u30B3\u30F3\u5316
+modal=\u30E2\u30FC\u30C0\u30EB
+multiline=\u8907\u6570\u884C
+multiselectable=\u8907\u6570\u9078\u629E\u53EF\u80FD
+opaque=\u4E0D\u900F\u660E
+pressed=\u62BC\u4E0B
+resizable=\u30B5\u30A4\u30BA\u5909\u66F4\u53EF\u80FD
+selectable=\u9078\u629E\u53EF\u80FD
+selected=\u9078\u629E
+showing=\u8868\u793A
+singleline=\u5358\u4E00\u884C
+transient=\u4E00\u6642
+visible=\u53EF\u8996
+vertical=\u5782\u76F4
+horizontal=\u6C34\u5E73
 #
 # accessible actions
 #
-toggle expand=\u30c8\u30b0\u30eb\u5c55\u958b
+toggle expand=\u30C8\u30B0\u30EB\u5C55\u958B
 
 # new relations, roles and states for J2SE 1.5.0
 
 # 
 # accessible relations
 #
-flowsTo=\u30d5\u30ed\u30fc\u5148
-flowsFrom=\u30d5\u30ed\u30fc\u5143
-subwindowOf=\u30b5\u30d6\u30a6\u30a3\u30f3\u30c9\u30a6
-parentWindowOf=\u89aa\u30a6\u30a3\u30f3\u30c9\u30a6
-embeds=\u57cb\u3081\u8fbc\u307f
-embeddedBy=\u57cb\u3081\u8fbc\u307f\u5143
-childNodeOf=\u5b50\u30ce\u30fc\u30c9
+flowsTo=flows to
+flowsFrom=flows from
+subwindowOf=subwindow of
+parentWindowOf=parent window of
+embeds=\u57CB\u8FBC\u307F
+embeddedBy=embedded by
+childNodeOf=child node of
 
 #
 # accessible roles
 #
-header=\u30d8\u30c3\u30c0
-footer=\u30d5\u30c3\u30bf
-paragraph=\u30d1\u30e9\u30b0\u30e9\u30d5
-ruler=\u30eb\u30fc\u30e9
-editbar=\u7de8\u96c6\u30d0\u30fc
-progressMonitor=\u9032\u6357\u30e2\u30cb\u30bf
+header=\u30D8\u30C3\u30C0\u30FC
+footer=\u30D5\u30C3\u30BF\u30FC
+paragraph=\u6BB5\u843D
+ruler=\u30EB\u30FC\u30E9\u30FC
+editbar=\u7DE8\u96C6\u30D0\u30FC
+progressMonitor=\u9032\u6357\u30E2\u30CB\u30BF\u30FC
 
 #
 # accessible states
 #
-managesDescendants=\u5b50\u5b6b\u3092\u7ba1\u7406
-indeterminate=\u4e0d\u78ba\u5b9a
-truncated=\u4e0d\u5b8c\u5168
+managesDescendants=\u5B50\u5B6B\u3092\u7BA1\u7406
+indeterminate=\u4E0D\u78BA\u5B9A
+truncated=\u4E0D\u5B8C\u5168
 
 # new for J2SE 1.6.0
 
 #
 # accessible roles
 #
-htmlcontainer=HTML \u30b3\u30f3\u30c6\u30ca
+htmlcontainer=HTML\u30B3\u30F3\u30C6\u30CA
 
 #
 # END OF MATERIAL TO LOCALIZE
--- a/src/share/classes/com/sun/accessibility/internal/resources/accessibility_ko.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/accessibility/internal/resources/accessibility_ko.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -13,133 +13,133 @@
 #
 # accessible roles
 #
-alert=\uacbd\uace0
-awtcomponent=AWT \uad6c\uc131\uc694\uc18c
-checkbox=\ud655\uc778\ub780
-colorchooser=\uc0c9\uc0c1 \uc120\ud0dd\uae30
-columnheader=\uc5f4 \uba38\ub9ac\uae00
-combobox=\ucf64\ubcf4 \uc0c1\uc790
-canvas=\uce94\ubc84\uc2a4
-desktopicon=\ub370\uc2a4\ud06c\ud0d1 \uc544\uc774\ucf58
-desktoppane=\ub370\uc2a4\ud06c\ud0d1 \ud45c\uc2dc \uc601\uc5ed
-dialog=\ub300\ud654 \uc0c1\uc790
-directorypane=\ub514\ub809\ud1a0\ub9ac \ud45c\uc2dc \uc601\uc5ed
-glasspane=\uae00\ub798\uc2a4 \ud45c\uc2dc \uc601\uc5ed
-filechooser=\ud30c\uc77c \uc120\ud0dd\uae30
-filler=\ud544\ub7ec
-frame=\ud504\ub808\uc784
-internalframe=\ub0b4\ubd80 \ud504\ub808\uc784
-label=\ub808\uc774\ube14
-layeredpane=\uacc4\uce35 \ud45c\uc2dc \uc601\uc5ed
-list=\ubaa9\ub85d
-listitem=\ubaa9\ub85d \ud56d\ubaa9
-menubar=\uba54\ub274 \ud45c\uc2dc\uc904
-menu=\uba54\ub274
-menuitem=\uba54\ub274 \ud56d\ubaa9
-optionpane=\uc635\uc158 \ud45c\uc2dc \uc601\uc5ed
-pagetab=\ud398\uc774\uc9c0 \ud0ed
-pagetablist=\ud398\uc774\uc9c0 \ud0ed \ubaa9\ub85d
-panel=\ud328\ub110
-passwordtext=\uc554\ud638 \ud14d\uc2a4\ud2b8
-popupmenu=\ud31d\uc5c5 \uba54\ub274
-progressbar=\uc9c4\ud589 \ub9c9\ub300
-pushbutton=\ub204\ub984 \ubc84\ud2bc
-radiobutton=\ub77c\ub514\uc624 \ubc84\ud2bc
-rootpane=\ub8e8\ud2b8 \ud45c\uc2dc \uc601\uc5ed
-rowheader=\ud589 \uba38\ub9ac\uae00
-scrollbar=\uc2a4\ud06c\ub864 \ub9c9\ub300
-scrollpane=\uc2a4\ud06c\ub864 \ud45c\uc2dc \uc601\uc5ed
-separator=\uad6c\ubd84\uc790
-slider=\uc2ac\ub77c\uc774\ub354
-splitpane=\ubd84\ud560 \ud45c\uc2dc \uc601\uc5ed
-swingcomponent=swing \uad6c\uc131\uc694\uc18c
-table=\ud14c\uc774\ube14
-text=\ud14d\uc2a4\ud2b8
-tree=\ud2b8\ub9ac
-togglebutton=\ud1a0\uae00 \ubc84\ud2bc
-toolbar=\ub3c4\uad6c \ubaa8\uc74c
-tooltip=\ub3c4\uad6c \ud301
-unknown=\uc54c\uc218 \uc5c6\uc74c
-viewport=\ubdf0\ud3ec\ud2b8
-window=\ucc3d
+alert=\uACBD\uBCF4
+awtcomponent=AWT \uAD6C\uC131 \uC694\uC18C
+checkbox=\uCCB4\uD06C \uBC15\uC2A4
+colorchooser=\uC0C9\uC0C1 \uC120\uD0DD\uAE30
+columnheader=\uC5F4 \uBA38\uB9AC\uAE00
+combobox=\uCF64\uBCF4 \uC0C1\uC790
+canvas=\uCE94\uBC84\uC2A4
+desktopicon=\uBC14\uD0D5 \uD654\uBA74 \uC544\uC774\uCF58
+desktoppane=\uBC14\uD0D5 \uD654\uBA74 \uCC3D
+dialog=\uB300\uD654\uC0C1\uC790
+directorypane=\uB514\uB809\uD1A0\uB9AC \uCC3D
+glasspane=\uAE00\uB798\uC2A4 \uCC3D
+filechooser=\uD30C\uC77C \uC120\uD0DD\uAE30
+filler=\uD544\uB7EC
+frame=\uD504\uB808\uC784
+internalframe=\uB0B4\uBD80 \uD504\uB808\uC784
+label=\uB808\uC774\uBE14
+layeredpane=\uACC4\uCE35\uC801 \uCC3D
+list=\uBAA9\uB85D
+listitem=\uBAA9\uB85D \uD56D\uBAA9
+menubar=\uBA54\uB274 \uD45C\uC2DC\uC904
+menu=\uBA54\uB274
+menuitem=\uBA54\uB274 \uD56D\uBAA9
+optionpane=\uC635\uC158 \uCC3D
+pagetab=\uD398\uC774\uC9C0 \uD0ED
+pagetablist=\uD398\uC774\uC9C0 \uD0ED \uBAA9\uB85D
+panel=\uD328\uB110
+passwordtext=\uBE44\uBC00\uBC88\uD638 \uD14D\uC2A4\uD2B8
+popupmenu=\uD31D\uC5C5 \uBA54\uB274
+progressbar=\uC9C4\uD589 \uB9C9\uB300
+pushbutton=\uB204\uB984 \uB2E8\uCD94
+radiobutton=\uB77C\uB514\uC624 \uB2E8\uCD94
+rootpane=\uB8E8\uD2B8 \uCC3D
+rowheader=\uD589 \uBA38\uB9AC\uAE00
+scrollbar=\uC2A4\uD06C\uB864 \uB9C9\uB300
+scrollpane=\uC2A4\uD06C\uB864 \uCC3D
+separator=\uAD6C\uBD84 \uAE30\uD638
+slider=\uC2AC\uB77C\uC774\uB354
+splitpane=\uBD84\uD560 \uCC3D
+swingcomponent=\uD68C\uC804 \uAD6C\uC131 \uC694\uC18C
+table=\uD14C\uC774\uBE14
+text=\uD14D\uC2A4\uD2B8
+tree=\uD2B8\uB9AC
+togglebutton=\uD1A0\uAE00 \uB2E8\uCD94
+toolbar=\uB3C4\uAD6C \uBAA8\uC74C
+tooltip=\uB3C4\uAD6C \uC124\uBA85
+unknown=\uC54C \uC218 \uC5C6\uC74C
+viewport=\uBDF0\uD3EC\uD2B8
+window=\uCC3D
 #
 # accessible relations
 #
-labelFor=\ub808\uc774\ube14 \ub300\uc0c1
-labeledBy=\ub808\uc774\ube14 \uc9c0\uc815\uc790
-memberOf=\ub2e4\uc74c\uc758 \uad6c\uc131\uc6d0
-controlledBy=\uc81c\uc5b4\uc790
-controllerFor=\uc81c\uc5b4\uae30 \ub300\uc0c1
+labelFor=\uB808\uC774\uBE14 \uB300\uC0C1
+labeledBy=\uB808\uC774\uBE14 \uC9C0\uC815\uC790
+memberOf=\uC18C\uC18D \uADF8\uB8F9
+controlledBy=controlledBy
+controllerFor=controllerFor
 #
 # accessible states
 #
-active=\ud65c\uc131
-armed=\ud06c\uae30
-busy=\uc0ac\uc6a9 \uc911
-checked=\uc120\ud0dd\ub428
-collapsed=\ucd95\uc18c\ub428
-editable=\ud3b8\uc9d1 \uac00\ub2a5
-expandable=\ud655\uc7a5 \uac00\ub2a5
-expanded=\ud655\uc7a5\ub428
-enabled=\ud65c\uc131\ud654\ub428
-focusable=\ud3ec\ucee4\uc2a4 \uac00\ub2a5
-focused=\ud3ec\ucee4\uc2a4 \uc9c0\uc815\ub428
-iconified=\uc544\uc774\ucf58\ud654\ub428
-modal=\ubaa8\ub2ec
-multiline=\ubcf5\uc218 \ud589
-multiselectable=\ubcf5\uc218\ub85c \uc120\ud0dd \uac00\ub2a5
-opaque=\ubd88\ud22c\uba85
-pressed=\ub204\ub984
-resizable=\ud06c\uae30 \uc870\uc815 \uac00\ub2a5
-selectable=\uc120\ud0dd \uac00\ub2a5
-selected=\uc120\ud0dd\ub428
-showing=\ud45c\uc2dc
-singleline=\ub2e8\uc120
-transient=\uc77c\uc2dc
-visible=\uac00\uc2dc
-vertical=\uc218\uc9c1
-horizontal=\uc218\ud3c9
+active=\uD65C\uC131
+armed=\uD06C\uAE30
+busy=\uC0AC\uC6A9 \uC911
+checked=\uC120\uD0DD\uB428
+collapsed=\uCD95\uC18C\uB428
+editable=\uD3B8\uC9D1 \uAC00\uB2A5
+expandable=\uD655\uC7A5 \uAC00\uB2A5
+expanded=\uD655\uC7A5\uB428
+enabled=\uC0AC\uC6A9
+focusable=\uD3EC\uCEE4\uC2A4 \uAC00\uB2A5
+focused=\uD3EC\uCEE4\uC2A4\uB428
+iconified=\uC544\uC774\uCF58\uD654\uB428
+modal=\uBAA8\uB2EC
+multiline=\uBCF5\uC218 \uD589
+multiselectable=\uB2E4\uC911 \uC120\uD0DD \uAC00\uB2A5
+opaque=\uBD88\uD22C\uBA85
+pressed=\uB204\uB984
+resizable=\uD06C\uAE30 \uC870\uC815 \uAC00\uB2A5
+selectable=\uC120\uD0DD \uAC00\uB2A5
+selected=\uC120\uD0DD\uB428
+showing=\uD45C\uC2DC
+singleline=\uD55C \uC904
+transient=\uC77C\uC2DC
+visible=\uD45C\uC2DC \uAC00\uB2A5
+vertical=\uC138\uB85C
+horizontal=\uAC00\uB85C
 #
 # accessible actions
 #
-toggle expand=\ud1a0\uae00 \ud655\uc7a5
+toggle \uD655\uC7A5=\uD1A0\uAE00 \uD655\uC7A5
 
 # new relations, roles and states for J2SE 1.5.0
 
 # 
 # accessible relations
 #
-flowsTo=(\uc73c)\ub85c \ud750\ub984
-flowsFrom=\uc5d0\uc11c \ud750\ub984
-subwindowOf=\ud558\uc704 \ucc3d
-parentWindowOf=\uc0c1\uc704 \ucc3d
-embeds=\uc744(\ub97c) \ud3ec\ud568
-embeddedBy=\uc5d0 \ud3ec\ud568
-childNodeOf=\ud558\uc704 \ub178\ub4dc
+flowsTo=\uD750\uB984 \uB300\uC0C1
+flowsFrom=\uD750\uB984 \uCD9C\uCC98
+subwindowOf=\uD558\uC704 \uCC3D
+parentWindowOf=\uC0C1\uC704 \uCC3D
+embeds=\uD3EC\uD568
+embeddedBy=\uD3EC\uD568 \uC8FC\uCCB4
+childNodeOf=\uD558\uC704 \uB178\uB4DC
 
 #
 # accessible roles
 #
-header=\uba38\ub9ac\ub9d0
-footer=\uaf2c\ub9ac\ub9d0
-paragraph=\ub2e8\ub77d
-ruler=\ub208\uae08\uc790
-editbar=\ud3b8\uc9d1 \ub3c4\uad6c
-progressMonitor=\uc9c4\ud589 \ubaa8\ub2c8\ud130
+header=\uBA38\uB9AC\uAE00
+footer=\uBC14\uB2E5\uAE00
+paragraph=\uB2E8\uB77D
+ruler=\uB208\uAE08\uC790
+editbar=\uD3B8\uC9D1 \uB3C4\uAD6C
+progressMonitor=\uC9C4\uD589 \uBAA8\uB2C8\uD130
 
 #
 # accessible states
 #
-managesDescendants=\ud558\uc704 \ud56d\ubaa9 \uad00\ub9ac
-indeterminate=\ubd80\uc815
-truncated=\uc0dd\ub7b5
+managesDescendants=\uC885\uC18D \uD56D\uBAA9 \uAD00\uB9AC
+indeterminate=\uD655\uC815\uB418\uC9C0 \uC54A\uC74C
+truncated=\uC798\uB9BC
 
 # new for J2SE 1.6.0
 
 #
 # accessible roles
 #
-htmlcontainer=HTML \ucee8\ud14c\uc774\ub108
+htmlcontainer=HTML \uCEE8\uD14C\uC774\uB108
 
 #
 # END OF MATERIAL TO LOCALIZE
--- a/src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -15,38 +15,38 @@
 #
 alert=alerta
 awtcomponent=componente AWT
-checkbox=caixa de sele\u00e7\u00e3o
+checkbox=caixa de sele\u00E7\u00E3o
 colorchooser=seletor de cores
-columnheader=cabe\u00e7alho da coluna
-combobox=caixa de combina\u00e7\u00e3o
+columnheader=cabe\u00E7alho da coluna
+combobox=caixa de combina\u00E7\u00E3o
 canvas=tela
-desktopicon=\u00edcone da \u00e1rea de trabalho
-desktoppane=painel da \u00e1rea de trabalho
-dialog=caixa de di\u00e1logo
-directorypane=painel do diret\u00f3rio
+desktopicon=\u00EDcone da \u00E1rea de trabalho
+desktoppane=painel da \u00E1rea de trabalho
+dialog=caixa de di\u00E1logo
+directorypane=painel do diret\u00F3rio
 glasspane=painel transparente
 filechooser=seletor de arquivos
-filler=preenchimento
+filler=preenchedor
 frame=quadro
 internalframe=quadro interno
-label=r\u00f3tulo
+label=r\u00F3tulo
 layeredpane=painel em camadas
 list=lista
 listitem=item da lista
 menubar=barra de menus
 menu=menu
 menuitem=item do menu
-optionpane=painel de op\u00e7\u00f5es
-pagetab=aba da p\u00e1gina
-pagetablist=lista de abas da p\u00e1gina
+optionpane=painel de op\u00E7\u00F5es
+pagetab=guia da p\u00E1gina
+pagetablist=lista de guias da p\u00E1gina
 panel=painel
 passwordtext=texto da senha
 popupmenu=menu pop-up
 progressbar=barra de progresso
-pushbutton=bot\u00e3o de a\u00e7\u00e3o
-radiobutton=bot\u00e3o de op\u00e7\u00e3o
+pushbutton=bot\u00E3o de a\u00E7\u00E3o
+radiobutton=bot\u00E3o de op\u00E7\u00E3o
 rootpane=painel base
-rowheader=cabe\u00e7alho da linha
+rowheader=cabe\u00E7alho da linha
 scrollbar=barra de rolagem
 scrollpane=painel de rolagem
 separator=separador
@@ -55,19 +55,19 @@
 swingcomponent=componente swing
 table=tabela
 text=texto
-tree=\u00e1rvore
-togglebutton=bot\u00e3o de altern\u00e2ncia
+tree=\u00E1rvore
+togglebutton=bot\u00E3o de altern\u00E2ncia
 toolbar=barra de ferramentas
 tooltip=dica de ferramenta
 unknown=desconhecido
-viewport=janela de visualiza\u00e7\u00e3o
+viewport=janela de visualiza\u00E7\u00E3o
 window=janela
 #
 # accessible relations
 #
-labelFor=r\u00f3tulo de
+labelFor=r\u00F3tulo de
 labeledBy=rotulado por
-memberOf=membro de 
+memberOf=membro de
 controlledBy=controlledBy
 controllerFor=controllerFor
 #
@@ -78,31 +78,31 @@
 busy=ocupado
 checked=selecionado
 collapsed=recolhido
-editable=edit\u00e1vel
-expandable=expans\u00edvel
+editable=edit\u00E1vel
+expandable=expans\u00EDvel
 expanded=expandido
-enabled=habilitado
-focusable=focaliz\u00e1vel
+enabled=ativado
+focusable=focaliz\u00E1vel
 focused=focalizado
 iconified=iconizado
 modal=modal
-multiline=v\u00e1rias linhas
-multiselectable=m\u00faltipla escolha
+multiline=v\u00E1rias linhas
+multiselectable=m\u00FAltipla escolha
 opaque=opaco
 pressed=pressionado
-resizable=redimension\u00e1vel
-selectable=selecion\u00e1vel
+resizable=redimension\u00E1vel
+selectable=selecion\u00E1vel
 selected=selecionado
-showing=exibindo
-singleline=linha \u00fanica
-transient=transit\u00f3rio
-visible=vis\u00edvel
+showing=mostrando
+singleline=linha \u00FAnica
+transient=transit\u00F3rio
+visible=vis\u00EDvel
 vertical=vertical
 horizontal=horizontal
 #
 # accessible actions
 #
-toggle expandir=alternar expandir
+toggle expandir=alternar expans\u00E3o
 
 # new relations, roles and states for J2SE 1.5.0
 
@@ -115,16 +115,16 @@
 parentWindowOf=janela pai de
 embeds=integra
 embeddedBy=integrado por
-childNodeOf=n\u00f3 filho de
+childNodeOf=n\u00F3 filho de
 
 #
 # accessible roles
 #
-header=cabe\u00e7alho
-footer=rodap\u00e9
-paragraph=par\u00e1grafo
-ruler=r\u00e9gua
-editbar=barra de edi\u00e7\u00e3o
+header=cabe\u00E7alho
+footer=rodap\u00E9
+paragraph=par\u00E1grafo
+ruler=r\u00E9gua
+editbar=barra de edi\u00E7\u00E3o
 progressMonitor=monitor de progresso
 
 #
@@ -139,7 +139,7 @@
 #
 # accessible roles
 #
-htmlcontainer=cont\u00eainer HTML
+htmlcontainer=Container de HTML
 
 #
 # END OF MATERIAL TO LOCALIZE
--- a/src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -13,109 +13,109 @@
 #
 # accessible roles
 #
-alert=varning
+alert=avisering
 awtcomponent=AWT-komponent
 checkbox=kryssruta
-colorchooser=f\u00e4rgv\u00e4ljare
+colorchooser=f\u00E4rgv\u00E4ljare
 columnheader=kolumnrubrik
 combobox=kombinationsruta
-canvas=bakgrund
+canvas=rityta
 desktopicon=skrivbordsikon
 desktoppane=skrivbordsruta
 dialog=dialogruta
 directorypane=katalogruta
 glasspane=glasruta
-filechooser=filv\u00e4ljare
+filechooser=filv\u00E4ljare
 filler=utfyllnad
 frame=ram
 internalframe=intern ram
 label=etikett
 layeredpane=staplad ruta
 list=lista
-listitem=listelement
-menubar=menylist
+listitem=listobjekt
+menubar=menyrad
 menu=meny
 menuitem=menyalternativ
 optionpane=alternativruta
 pagetab=sidflik
 pagetablist=sidflikslista
 panel=panel
-passwordtext=l\u00f6senordstext
+passwordtext=l\u00F6senordstext
 popupmenu=snabbmeny
-progressbar=statuslist
+progressbar=statusrad
 pushbutton=knapp
-radiobutton=envalsknapp
+radiobutton=alternativknapp
 rootpane=grundruta
-rowheader=radhuvud
-scrollbar=bl\u00e4ddringslist
-scrollpane=bl\u00e4dderruta
+rowheader=radrubrik
+scrollbar=rullningslist
+scrollpane=rullningsruta
 separator=avskiljare
 slider=skjutreglage
 splitpane=delad ruta
 swingcomponent=swing-komponent
 table=tabell
 text=text
-tree=tr\u00e4d
-togglebutton=v\u00e4xlingsknapp
+tree=tr\u00E4d
+togglebutton=v\u00E4xlingsknapp
 toolbar=verktygsrad
 tooltip=knappbeskrivning
-unknown=ok\u00e4nd
+unknown=ok\u00E4nd
 viewport=vyport
-window=f\u00f6nster
+window=f\u00F6nster
 #
 # accessible relations
 #
-labelFor=etikett f\u00f6r
+labelFor=etikett f\u00F6r
 labeledBy=etikett av
 memberOf=medlem i
-controlledBy=kontrolleratAv
-controllerFor=styrenhetF\u00f6r
+controlledBy=controlledBy
+controllerFor=controllerFor
 #
 # accessible states
 #
 active=aktiv
-armed=anv\u00e4nd
+armed=redo
 busy=upptagen
 checked=markerad
-collapsed=inf\u00e4lld
+collapsed=komprimerad
 editable=redigerbar
-expandable=ut\u00f6kningsbar
-expanded=ut\u00f6kad
+expandable=ut\u00F6kningsbar
+expanded=ut\u00F6kad
 enabled=aktiverad
 focusable=fokuseringsbar
 focused=fokuserad
 iconified=minimerad
-modal=tillst\u00e5ndsberoende
-multiline=flera linjer
-multiselectable=multivalbar
-opaque=ogenomskinlig
+modal=modal
+multiline=flera rader
+multiselectable=flerval
+opaque=t\u00E4ckande
 pressed=nedtryckt
-resizable=storleks\u00e4ndringsbar
-selectable=markeringsbar
+resizable=storleks\u00E4ndringsbar
+selectable=valbar
 selected=vald
-showing=visa
+showing=visas
 singleline=en rad
-transient=flytande
+transient=tillf\u00E4llig
 visible=synlig
 vertical=vertikal
 horizontal=horisontell
 #
 # accessible actions
 #
-toggle expand=v\u00e4xla ut\u00f6ka
+toggle ut\u00F6ka=v\u00E4xla ut\u00F6ka
 
 # new relations, roles and states for J2SE 1.5.0
 
 # 
 # accessible relations
 #
-flowsTo=fl\u00f6dar till
-flowsFrom=fl\u00f6dar fr\u00e5n
-subwindowOf=delf\u00f6nster av
-parentWindowOf=\u00f6verordnat f\u00f6nster f\u00f6r
-embeds=b\u00e4ddar in
-embeddedBy=b\u00e4ddas in av
-childNodeOf=underordnad nod f\u00f6r
+flowsTo=fl\u00F6dar till
+flowsFrom=fl\u00F6dar fr\u00E5n
+subwindowOf=delf\u00F6nster av
+parentWindowOf=\u00F6verordnat f\u00F6nster f\u00F6r
+embeds=b\u00E4ddar in
+embeddedBy=b\u00E4ddas in av
+childNodeOf=underordnad nod f\u00F6r
 
 #
 # accessible roles
@@ -125,14 +125,14 @@
 paragraph=stycke
 ruler=linjal
 editbar=redigeringslist
-progressMonitor=f\u00f6rloppsindikator
+progressMonitor=f\u00F6rlopps\u00F6vervakare
 
 #
 # accessible states
 #
-managesDescendants=hanterar efterf\u00f6ljare
-indeterminate=obest\u00e4mt
-truncated=avklippt
+managesDescendants=hanterar underordnade
+indeterminate=obest\u00E4mt
+truncated=kapad
 
 # new for J2SE 1.6.0
 
--- a/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -13,133 +13,133 @@
 #
 # accessible roles
 #
-alert=\u8b66\u62a5
-awtcomponent=AWT \u7ec4\u4ef6
-checkbox=\u590d\u9009\u6846
-colorchooser=\u989c\u8272\u9009\u62e9\u5668
+alert=\u9884\u8B66
+awtcomponent=AWT \u7EC4\u4EF6
+checkbox=\u590D\u9009\u6846
+colorchooser=\u989C\u8272\u9009\u62E9\u5668
 columnheader=\u5217\u6807\u9898
-combobox=\u7ec4\u5408\u6846
-canvas=\u753b\u5e03
-desktopicon=\u684c\u9762\u56fe\u6807
-desktoppane=\u684c\u9762\u7a97\u683c
-dialog=\u5bf9\u8bdd
-directorypane=\u76ee\u5f55\u7a97\u683c
-glasspane=\u73bb\u7483\u7a97\u683c
-filechooser=\u6587\u4ef6\u9009\u62e9\u5668
-filler=\u6f0f\u6597
-frame=\u5e27
-internalframe=\u5185\u90e8\u5e27
-label=\u6807\u7b7e
-layeredpane=\u5206\u5c42\u7a97\u683c
+combobox=\u7EC4\u5408\u6846
+canvas=\u753B\u5E03
+desktopicon=\u684C\u9762\u56FE\u6807
+desktoppane=\u684C\u9762\u7A97\u683C
+dialog=\u5BF9\u8BDD
+directorypane=\u76EE\u5F55\u7A97\u683C
+glasspane=\u73BB\u7483\u7A97\u683C
+filechooser=\u6587\u4EF6\u9009\u62E9\u5668
+filler=\u6F0F\u6597
+frame=\u5E27
+internalframe=\u5185\u90E8\u5E27
+label=\u6807\u7B7E
+layeredpane=\u5206\u5C42\u7A97\u683C
 list=\u5217\u8868
 listitem=\u5217\u8868\u9879
-menubar=\u83dc\u5355\u680f
-menu=\u83dc\u5355
-menuitem=\u83dc\u5355\u9879
-optionpane=\u9009\u9879\u7a97\u683c
-pagetab=\u9875\u6807\u7b7e
-pagetablist=\u9875\u6807\u7b7e\u5217\u8868
-panel=\u9762\u677f
-passwordtext=\u5bc6\u7801\u6587\u672c
-popupmenu=\u5f39\u51fa\u5f0f\u83dc\u5355
-progressbar=\u8fdb\u5ea6\u6761
-pushbutton=\u6309\u94ae
-radiobutton=\u5355\u9009\u6309\u94ae
-rootpane=\u6839\u7a97\u683c
-rowheader=\u884c\u6807\u9898
-scrollbar=\u6eda\u52a8\u6761
-scrollpane=\u6eda\u52a8\u7a97\u683c
+menubar=\u83DC\u5355\u680F
+menu=\u83DC\u5355
+menuitem=\u83DC\u5355\u9879
+optionpane=\u9009\u9879\u7A97\u683C
+pagetab=\u9875\u6807\u7B7E
+pagetablist=\u9875\u6807\u7B7E\u5217\u8868
+panel=\u9762\u677F
+passwordtext=\u53E3\u4EE4\u6587\u672C
+popupmenu=\u5F39\u51FA\u5F0F\u83DC\u5355
+progressbar=\u8FDB\u5EA6\u680F
+pushbutton=\u6309\u94AE
+radiobutton=\u5355\u9009\u6309\u94AE
+rootpane=\u6839\u7A97\u683C
+rowheader=\u884C\u6807\u9898
+scrollbar=\u6EDA\u52A8\u6761
+scrollpane=\u6EDA\u52A8\u7A97\u683C
 separator=\u5206\u9694\u6761
-slider=\u6ed1\u5757
-splitpane=\u62c6\u5206\u7a97\u683c
-swingcomponent=\u65cb\u8f6c\u7ec4\u4ef6
+slider=\u6ED1\u5757
+splitpane=\u62C6\u5206\u7A97\u683C
+swingcomponent=\u65CB\u8F6C\u7EC4\u4EF6
 table=\u8868
-text=\u6587\u672c
+text=\u6587\u672C
 tree=\u6811
-togglebutton=\u5207\u6362\u6309\u94ae
-toolbar=\u5de5\u5177\u680f
-tooltip=\u5de5\u5177\u63d0\u793a
-unknown=\u672a\u77e5
-viewport=\u89c6\u53e3
-window=\u7a97\u53e3
+togglebutton=\u5207\u6362\u6309\u94AE
+toolbar=\u5DE5\u5177\u680F
+tooltip=\u5DE5\u5177\u63D0\u793A
+unknown=\u672A\u77E5
+viewport=\u89C6\u7A97
+window=\u7A97\u53E3
 #
 # accessible relations
 #
-labelFor=\u6807\u7b7e\u5c5e\u4e8e
-labeledBy=\u6807\u7b7e\u5236\u4f5c\u8005
-memberOf=\u5c5e\u4e8e
-controlledBy=\u63a7\u5236\u8005
-controllerFor=\u63a7\u5236\u5bf9\u8c61
+labelFor=\u6807\u7B7E\u5C5E\u4E8E
+labeledBy=\u6807\u7B7E\u5236\u4F5C\u8005
+memberOf=\u5C5E\u4E8E
+controlledBy=controlledBy
+controllerFor=controllerFor
 #
 # accessible states
 #
-active=\u6d3b\u52a8
-armed=\u5f85\u547d
-busy=\u5fd9
-checked=\u5df2\u9009\u4e2d
-collapsed=\u5df2\u6536\u7f29
-editable=\u53ef\u7f16\u8f91
-expandable=\u53ef\u5c55\u5f00
-expanded=\u5df2\u5c55\u5f00
-enabled=\u5df2\u542f\u7528
-focusable=\u53ef\u96c6\u4e2d
-focused=\u5df2\u96c6\u4e2d
-iconified=\u56fe\u6807\u5f0f
-modal=\u6a21\u6001
-multiline=\u591a\u884c
-multiselectable=\u591a\u9009\u62e9
-opaque=\u4e0d\u900f\u660e
-pressed=\u5df2\u6309\u4e0b
-resizable=\u5927\u5c0f\u53ef\u8c03
-selectable=\u53ef\u9009\u62e9
-selected=\u5df2\u9009\u5b9a
-showing=\u6b63\u5728\u663e\u793a
-singleline=\u5355\u884c
-transient=\u77ac\u65f6
-visible=\u53ef\u89c1
-vertical=\u5782\u76f4
-horizontal=\u6c34\u5e73
+active=\u6D3B\u52A8
+armed=\u5F85\u547D
+busy=\u5FD9
+checked=\u5DF2\u9009\u4E2D
+collapsed=\u5DF2\u6536\u7F29
+editable=\u53EF\u7F16\u8F91
+expandable=\u53EF\u5C55\u5F00
+expanded=\u5DF2\u5C55\u5F00
+enabled=\u542F\u7528
+focusable=\u53EF\u96C6\u4E2D
+focused=\u5DF2\u96C6\u4E2D
+iconified=\u56FE\u6807\u5F0F
+modal=\u6A21\u6001
+multiline=\u591A\u884C
+multiselectable=\u591A\u9009\u62E9
+opaque=\u4E0D\u900F\u660E
+pressed=\u5DF2\u6309\u4E0B
+resizable=\u53EF\u8C03\u6574\u5927\u5C0F
+selectable=\u53EF\u9009\u62E9
+selected=\u6240\u9009
+showing=\u6B63\u5728\u663E\u793A
+singleline=\u5355\u884C
+transient=\u77AC\u65F6
+visible=\u53EF\u89C1
+vertical=\u5782\u76F4
+horizontal=\u6C34\u5E73
 #
 # accessible actions
 #
-toggle expand=\u5207\u6362\u5c55\u5f00
+toggle expand=\u5207\u6362\u5C55\u5F00
 
 # new relations, roles and states for J2SE 1.5.0
 
 # 
 # accessible relations
 #
-flowsTo=\u6d41\u5411
-flowsFrom=\u6d41\u81ea
-subwindowOf=\u5b50\u7a97\u53e3
-parentWindowOf=\u7236\u7a97\u53e3
-embeds=\u5d4c\u5165\u9879
-embeddedBy=\u5d4c\u5165\u8005
-childNodeOf=\u5b50\u8282\u70b9
+flowsTo=\u6D41\u5411
+flowsFrom=\u6D41\u81EA
+subwindowOf=\u5B50\u7A97\u53E3
+parentWindowOf=\u7236\u7A97\u53E3
+embeds=\u5D4C\u5165\u9879
+embeddedBy=\u5D4C\u5165\u8005
+childNodeOf=\u5B50\u8282\u70B9
 
 #
 # accessible roles
 #
 header=\u9875\u7709
-footer=\u9875\u811a
-paragraph=\u6bb5\u843d
-ruler=\u6807\u5c3a
-editbar=\u7f16\u8f91\u680f
-progressMonitor=\u8fdb\u5ea6\u76d1\u89c6\u5668
+footer=\u9875\u811A
+paragraph=\u6BB5\u843D
+ruler=\u6807\u5C3A
+editbar=\u7F16\u8F91\u680F
+progressMonitor=\u8FDB\u5EA6\u76D1\u89C6\u5668
 
 #
 # accessible states
 #
-managesDescendants=\u7ba1\u7406\u5b50\u5b59
-indeterminate=\u4e0d\u786e\u5b9a
-truncated=\u5df2\u622a\u65ad
+managesDescendants=\u7BA1\u7406\u5B50\u9879
+indeterminate=\u4E0D\u786E\u5B9A
+truncated=\u5DF2\u622A\u65AD
 
 # new for J2SE 1.6.0
 
 #
 # accessible roles
 #
-htmlcontainer=HTML \u5bb9\u5668
+htmlcontainer=HTML \u5BB9\u5668
 
 #
 # END OF MATERIAL TO LOCALIZE
--- a/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_TW.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_TW.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -13,133 +13,133 @@
 #
 # accessible roles
 #
-alert=\u8b66\u793a
-awtcomponent=AWT \u5143\u4ef6
-checkbox=\u6838\u53d6\u65b9\u584a
-colorchooser=\u8272\u5f69\u9078\u64c7\u5668
-columnheader=\u76f4\u6b04\u6a19\u984c
-combobox=\u4e0b\u62c9\u5f0f\u6e05\u55ae\u65b9\u584a
-canvas=\u756b\u5e03
-desktopicon=\u684c\u9762\u5716\u793a
-desktoppane=\u684c\u9762\u7a97\u683c
-dialog=\u5c0d\u8a71\u65b9\u584a
-directorypane=\u76ee\u9304\u7a97\u683c
-glasspane=\u6aa2\u8996\u7a97\u683c
-filechooser=\u6a94\u6848\u9078\u64c7\u5668
-filler=\u586b\u5145\u7269
-frame=\u6846\u67b6
-internalframe=\u5167\u90e8\u6846\u67b6
-label=\u6a19\u7c64
-layeredpane=\u5206\u5c64\u7a97\u683c
-list=\u6e05\u55ae
-listitem=\u6e05\u55ae\u9805\u76ee
-menubar=\u529f\u80fd\u8868\u5217
-menu=\u529f\u80fd\u8868
-menuitem=\u529f\u80fd\u8868\u9805\u76ee
-optionpane=\u9078\u9805\u7a97\u683c
-pagetab=\u9801\u9762\u6a19\u7c64
-pagetablist=\u9801\u9762\u6a19\u7c64\u6e05\u55ae
-panel=\u9762\u677f
-passwordtext=\u5bc6\u78bc\u6587\u5b57
-popupmenu=\u8e66\u73fe\u5f0f\u529f\u80fd\u8868
-progressbar=\u9032\u5ea6\u5217
-pushbutton=\u4e0b\u58d3\u6309\u9215
-radiobutton=\u55ae\u9078\u9215
-rootpane=root \u7a97\u683c
-rowheader=\u5217\u6a19\u984c
-scrollbar=\u6372\u8ef8
-scrollpane=\u6372\u52d5\u7a97\u683c
+alert=\u8B66\u793A
+awtcomponent=AWT \u5143\u4EF6
+checkbox=\u6838\u53D6\u65B9\u584A
+colorchooser=\u8272\u5F69\u9078\u64C7\u5668
+columnheader=\u76F4\u6B04\u6A19\u984C
+combobox=\u4E0B\u62C9\u5F0F\u6E05\u55AE\u65B9\u584A
+canvas=\u756B\u5E03
+desktopicon=\u684C\u9762\u5716\u793A
+desktoppane=\u684C\u9762\u7A97\u683C
+dialog=\u5C0D\u8A71\u65B9\u584A
+directorypane=\u76EE\u9304\u7A97\u683C
+glasspane=\u6AA2\u8996\u7A97\u683C
+filechooser=\u6A94\u6848\u9078\u64C7\u5668
+filler=\u586B\u5145\u7269
+frame=\u6846\u67B6
+internalframe=\u5167\u90E8\u6846\u67B6
+label=\u6A19\u7C64
+layeredpane=\u5206\u5C64\u7A97\u683C
+list=\u6E05\u55AE
+listitem=\u6E05\u55AE\u9805\u76EE
+menubar=\u529F\u80FD\u8868\u5217
+menu=\u529F\u80FD\u8868
+menuitem=\u529F\u80FD\u8868\u9805\u76EE
+optionpane=\u9078\u9805\u7A97\u683C
+pagetab=\u9801\u9762\u9801\u7C64
+pagetablist=\u9801\u9762\u9801\u7C64\u6E05\u55AE
+panel=\u9762\u677F
+passwordtext=\u5BC6\u78BC\u6587\u5B57
+popupmenu=\u5373\u73FE\u5F0F\u529F\u80FD\u8868
+progressbar=\u9032\u5EA6\u5217
+pushbutton=\u4E0B\u58D3\u6309\u9215
+radiobutton=\u55AE\u9078\u9215
+rootpane=root \u7A97\u683C
+rowheader=\u5217\u6A19\u984C
+scrollbar=\u6372\u8EF8
+scrollpane=\u6372\u52D5\u7A97\u683C
 separator=\u5206\u9694\u5143
-slider=\u6ed1\u52d5\u8ef8
-splitpane=\u5206\u5272\u7a97\u683c
-swingcomponent=Swing \u5143\u4ef6
-table=\u8868\u683c
-text=\u6587\u5b57
-tree=\u6a39\u72c0\u7d50\u69cb
-togglebutton=\u5207\u63db\u6309\u9215
-toolbar=\u5de5\u5177\u5217
-tooltip=\u5de5\u5177\u63d0\u793a
-unknown=\u672a\u77e5
-viewport=\u6aa2\u8996\u5340
-window=\u8996\u7a97
+slider=\u6ED1\u52D5\u8EF8
+splitpane=\u5206\u5272\u7A97\u683C
+swingcomponent=Swing \u5143\u4EF6
+table=\u8868\u683C
+text=\u6587\u5B57
+tree=\u6A39\u72C0\u7D50\u69CB
+togglebutton=\u5207\u63DB\u6309\u9215
+toolbar=\u5DE5\u5177\u5217
+tooltip=\u5DE5\u5177\u63D0\u793A
+unknown=\u4E0D\u660E\u7684
+viewport=\u6AA2\u8996\u5340
+window=\u8996\u7A97
 #
 # accessible relations
 #
-labelFor=\u6a19\u793a\u5c0d\u8c61
-labeledBy=\u6a19\u793a\u8005
-memberOf=\u6240\u5c6c\u6210\u54e1
-controlledBy=\u63a7\u5236\u8005
-controllerFor=\u63a7\u5236\u5c0d\u8c61
+labelFor=\u6A19\u793A\u5C0D\u8C61
+labeledBy=\u6A19\u793A\u8005
+memberOf=\u6240\u5C6C\u6210\u54E1
+controlledBy=\u63A7\u5236\u8005
+controllerFor=\u63A7\u5236\u5C0D\u8C61
 #
 # accessible states
 #
-active=\u4f5c\u7528\u4e2d
-armed=\u5df2\u914d\u5099
-busy=\u5fd9\u788c\u4e2d
-checked=\u5df2\u6838\u9078
-collapsed=\u5df2\u6536\u7e2e
-editable=\u53ef\u7de8\u8f2f
-expandable=\u53ef\u64f4\u5c55
-expanded=\u5df2\u64f4\u5c55
-enabled=\u5df2\u555f\u52d5
-focusable=\u53ef\u805a\u7126
-focused=\u5df2\u805a\u7126
-iconified=\u5df2\u5716\u793a\u5316
-modal=\u6a21\u614b
-multiline=\u591a\u884c
-multiselectable=\u53ef\u591a\u91cd\u9078\u53d6
-opaque=\u4e0d\u900f\u660e
-pressed=\u5df2\u6309\u4e0b
-resizable=\u53ef\u8abf\u6574\u5927\u5c0f
-selectable=\u53ef\u9078\u53d6
-selected=\u5df2\u9078\u53d6
-showing=\u986f\u793a
-singleline=\u55ae\u884c
-transient=\u66ab\u6642\u7684
-visible=\u53ef\u898b\u7684
-vertical=\u5782\u76f4
-horizontal=\u6c34\u5e73
+active=\u4F5C\u7528\u4E2D
+armed=\u5DF2\u914D\u5099
+busy=\u5FD9\u788C\u4E2D
+checked=\u5DF2\u6838\u9078
+collapsed=\u5DF2\u6536\u7E2E
+editable=\u53EF\u7DE8\u8F2F
+expandable=\u53EF\u64F4\u5C55
+expanded=\u5DF2\u64F4\u5C55
+enabled=\u5DF2\u555F\u7528
+focusable=\u53EF\u805A\u7126
+focused=\u5DF2\u805A\u7126
+iconified=\u5DF2\u5716\u793A\u5316
+modal=\u6A21\u614B
+multiline=\u591A\u884C
+multiselectable=\u53EF\u591A\u91CD\u9078\u53D6
+opaque=\u4E0D\u900F\u660E
+pressed=\u5DF2\u6309\u4E0B
+resizable=\u53EF\u8ABF\u6574\u5927\u5C0F
+selectable=\u53EF\u9078\u53D6
+selected=\u5DF2\u9078\u53D6
+showing=\u986F\u793A
+singleline=\u55AE\u884C
+transient=\u66AB\u6642\u7684
+visible=\u53EF\u898B\u7684
+vertical=\u5782\u76F4
+horizontal=\u6C34\u5E73
 #
 # accessible actions
 #
-toggle expand=\u5207\u63db\u64f4\u5c55
+toggle expand=\u5207\u63DB\u64F4\u5C55
 
 # new relations, roles and states for J2SE 1.5.0
 
 # 
 # accessible relations
 #
-flowsTo=\u6d41\u52d5\u81f3
-flowsFrom=\u6d41\u52d5\u81ea
-subwindowOf=\u5b50\u8996\u7a97
-parentWindowOf=\u7236\u7cfb\u8996\u7a97
-embeds=\u5167\u5d4c
-embeddedBy=\u5167\u5d4c\u8005
-childNodeOf=\u5b50\u7bc0\u9ede
+flowsTo=\u6D41\u52D5\u81F3
+flowsFrom=\u6D41\u52D5\u81EA
+subwindowOf=\u5B50\u8996\u7A97
+parentWindowOf=\u7236\u7CFB\u8996\u7A97
+embeds=\u5167\u5D4C
+embeddedBy=\u5167\u5D4C\u8005
+childNodeOf=\u5B50\u7BC0\u9EDE
 
 #
 # accessible roles
 #
 header=\u9801\u9996
-footer=\u9801\u5c3e
-paragraph=\u6bb5\u843d
-ruler=\u6a19\u5c3a
-editbar=\u7de8\u8f2f\u5217
-progressMonitor=\u9032\u5ea6\u76e3\u8996\u5668
+footer=\u9801\u5C3E
+paragraph=\u6BB5\u843D
+ruler=\u5C3A\u898F
+editbar=\u7DE8\u8F2F\u5217
+progressMonitor=\u9032\u5EA6\u76E3\u8996\u5668
 
 #
 # accessible states
 #
-managesDescendants=\u7ba1\u7406\u5b50\u4ee3
-indeterminate=\u4e0d\u78ba\u5b9a
-truncated=\u5df2\u622a\u65b7
+managesDescendants=\u7BA1\u7406\u5B50\u4EE3
+indeterminate=\u4E0D\u78BA\u5B9A
+truncated=\u5DF2\u622A\u65B7
 
 # new for J2SE 1.6.0
 
 #
 # accessible roles
 #
-htmlcontainer=HTML \u5bb9\u5668
+htmlcontainer=HTML \u5BB9\u5668
 
 #
 # END OF MATERIAL TO LOCALIZE
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -21,19 +21,19 @@
 # character of GTKColorChooserPanel.hueText should be underlined to
 # represent the mnemonic.
 GTKColorChooserPanel.hueText=Farbton:
-GTKColorChooserPanel.hueMnemonic=70
+GTKColorChooserPanel.hueMnemonic=72
 
 GTKColorChooserPanel.redText=Rot:
-GTKColorChooserPanel.redMnemonic=82
+GTKColorChooserPanel.redMnemonic=69
 
-GTKColorChooserPanel.saturationText=S\u00e4ttigung:
+GTKColorChooserPanel.saturationText=S\u00E4ttigung:
 GTKColorChooserPanel.saturationMnemonic=83
 
-GTKColorChooserPanel.greenText=Gr\u00fcn:
+GTKColorChooserPanel.greenText=Gr\u00FCn:
 GTKColorChooserPanel.greenMnemonic=71
 
 GTKColorChooserPanel.valueText=Wert:
-GTKColorChooserPanel.valueMnemonic=87
+GTKColorChooserPanel.valueMnemonic=86
 
 GTKColorChooserPanel.blueText=Blau:
 GTKColorChooserPanel.blueMnemonic=66
@@ -49,35 +49,35 @@
 FileChooser.newFolderButtonText=Neuer Ordner
 FileChooser.newFolderButtonMnemonic=78
 FileChooser.newFolderDialogText=Ordnername:
-FileChooser.newFolderNoDirectoryErrorTitleText=Error
-FileChooser.newFolderNoDirectoryErrorText=Error creating directory "{0}": No such file or directory
-FileChooser.deleteFileButtonText=Datei l\u00f6schen
+FileChooser.newFolderNoDirectoryErrorTitleText=Fehler
+FileChooser.newFolderNoDirectoryErrorText=Fehler beim Erstellen von Verzeichnis "{0}": Datei oder Verzeichnis nicht vorhanden
+FileChooser.deleteFileButtonText=Datei l\u00F6schen
 FileChooser.deleteFileButtonMnemonic=76
 FileChooser.renameFileButtonText=Datei umbenennen
-FileChooser.renameFileButtonMnemonic=87
+FileChooser.renameFileButtonMnemonic=82
 FileChooser.cancelButtonText=Abbrechen
-FileChooser.cancelButtonMnemonic=83
-FileChooser.saveButtonText=Speichern
-FileChooser.saveButtonMnemonic=69
+FileChooser.cancelButtonMnemonic=67
+FileChooser.saveButtonText=OK
+FileChooser.saveButtonMnemonic=79
 FileChooser.openButtonText=OK
 FileChooser.openButtonMnemonic=79
 FileChooser.saveDialogTitleText=Speichern
-FileChooser.openDialogTitleText=\u00d6ffnen
+FileChooser.openDialogTitleText=\u00D6ffnen
 FileChooser.pathLabelText=Auswahl:
 FileChooser.filterLabelText=Filter:
 FileChooser.pathLabelMnemonic=83
 FileChooser.foldersLabelText=Ordner
-FileChooser.foldersLabelMnemonic=82
+FileChooser.foldersLabelMnemonic=68
 FileChooser.filesLabelText=Dateien
 FileChooser.filesLabelMnemonic=70
 
-FileChooser.cancelButtonToolTipText=Farbauswahl abbrechen
-FileChooser.saveButtonToolTipText=Ausgew\u00e4hlte Datei speichern
-FileChooser.openButtonToolTipText=Ausgew\u00e4hlte Datei \u00f6ffnen
+FileChooser.cancelButtonToolTipText=Dialogfeld f\u00FCr Dateiauswahl schlie\u00DFen.
+FileChooser.saveButtonToolTipText=Ausgew\u00E4hlte Datei speichern.
+FileChooser.openButtonToolTipText=Ausgew\u00E4hlte Datei \u00F6ffnen.
 
 FileChooser.renameFileDialogText=Datei "{0}" umbenennen in
 FileChooser.renameFileErrorTitle=Fehler 
 FileChooser.renameFileErrorText=Fehler beim Umbenennen der Datei "{0}" in "{1}"
 
 OptionPane.okButtonMnemonic=79
-OptionPane.cancelButtonMnemonic=83
+OptionPane.cancelButtonMnemonic=67
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -6,7 +6,7 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.nameText=Selector de color para GTK
+GTKColorChooserPanel.nameText=Selector de Color para GTK
 # mnemonic as a VK_ constant
 GTKColorChooserPanel.mnemonic=71
 # Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you
@@ -20,64 +20,64 @@
 # GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second
 # character of GTKColorChooserPanel.hueText should be underlined to
 # represent the mnemonic.
-GTKColorChooserPanel.hueText=Tono:
-GTKColorChooserPanel.hueMnemonic=84
+GTKColorChooserPanel.hueText=Matiz:
+GTKColorChooserPanel.hueMnemonic=72
 
 GTKColorChooserPanel.redText=Rojo:
-GTKColorChooserPanel.redMnemonic=82
+GTKColorChooserPanel.redMnemonic=69
 
-GTKColorChooserPanel.saturationText=Saturaci\u00f3n:
+GTKColorChooserPanel.saturationText=Saturaci\u00F3n:
 GTKColorChooserPanel.saturationMnemonic=83
 
 GTKColorChooserPanel.greenText=Verde:
-GTKColorChooserPanel.greenMnemonic=86
+GTKColorChooserPanel.greenMnemonic=71
 
 GTKColorChooserPanel.valueText=Valor:
-GTKColorChooserPanel.valueMnemonic=65
+GTKColorChooserPanel.valueMnemonic=86
 
 GTKColorChooserPanel.blueText=Azul:
-GTKColorChooserPanel.blueMnemonic=65
+GTKColorChooserPanel.blueMnemonic=66
 
-GTKColorChooserPanel.colorNameText=Nombre del color:
+GTKColorChooserPanel.colorNameText=Nombre del Color:
 GTKColorChooserPanel.colorNameMnemonic=78
 
 
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.acceptAllFileFilterText=Todos los archivos
-FileChooser.newFolderButtonText=Nueva carpeta
+FileChooser.acceptAllFileFilterText=Todos los Archivos
+FileChooser.newFolderButtonText=Nueva Carpeta
 FileChooser.newFolderButtonMnemonic=78
-FileChooser.newFolderDialogText=Nombre de la carpeta:
+FileChooser.newFolderDialogText=Nombre de la Carpeta:
 FileChooser.newFolderNoDirectoryErrorTitleText=Error
-FileChooser.newFolderNoDirectoryErrorText=Error creating directory "{0}": No such file or directory
-FileChooser.deleteFileButtonText=Eliminar archivo
+FileChooser.newFolderNoDirectoryErrorText=Error al crear el directorio "{0}": no existe dicho archivo o directorio
+FileChooser.deleteFileButtonText=Suprimir Archivo
 FileChooser.deleteFileButtonMnemonic=76
-FileChooser.renameFileButtonText=Renombrar archivo
+FileChooser.renameFileButtonText=Cambiar Nombre a Archivo
 FileChooser.renameFileButtonMnemonic=82
 FileChooser.cancelButtonText=Cancelar
 FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=Guardar
-FileChooser.saveButtonMnemonic=82
+FileChooser.saveButtonText=Aceptar
+FileChooser.saveButtonMnemonic=79
 FileChooser.openButtonText=Aceptar
 FileChooser.openButtonMnemonic=79
 FileChooser.saveDialogTitleText=Guardar
 FileChooser.openDialogTitleText=Abrir
-FileChooser.pathLabelText=Selecci\u00f3n:
+FileChooser.pathLabelText=Selecci\u00F3n:
 FileChooser.filterLabelText=Filtro:
 FileChooser.pathLabelMnemonic=83
 FileChooser.foldersLabelText=Carpetas
-FileChooser.foldersLabelMnemonic=74
+FileChooser.foldersLabelMnemonic=68
 FileChooser.filesLabelText=Archivos
 FileChooser.filesLabelMnemonic=70
 
-FileChooser.cancelButtonToolTipText=Cancelar cuadro de di\u00e1logo de selecci\u00f3n de archivos.
+FileChooser.cancelButtonToolTipText=Abortar cuadro de di\u00E1logo del selector de archivos.
 FileChooser.saveButtonToolTipText=Guardar el archivo seleccionado.
 FileChooser.openButtonToolTipText=Abrir el archivo seleccionado.
 
 FileChooser.renameFileDialogText=Cambiar el nombre del archivo "{0}" por
 FileChooser.renameFileErrorTitle=Error 
-FileChooser.renameFileErrorText=Error al cambiar el nombre del archivo "{0}" por "{1}"
+FileChooser.renameFileErrorText=Error al cambiar el nombre del archivo "{0}" a "{1}"
 
 OptionPane.okButtonMnemonic=79
 OptionPane.cancelButtonMnemonic=67
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -6,7 +6,7 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.nameText=S\u00e9lectionneur de couleur GTK
+GTKColorChooserPanel.nameText=S\u00E9lecteur de couleurs GTK
 # mnemonic as a VK_ constant
 GTKColorChooserPanel.mnemonic=71
 # Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you
@@ -20,25 +20,25 @@
 # GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second
 # character of GTKColorChooserPanel.hueText should be underlined to
 # represent the mnemonic.
-GTKColorChooserPanel.hueText=Teinte\u00a0:
-GTKColorChooserPanel.hueMnemonic=84
+GTKColorChooserPanel.hueText=Teinte\u00A0:
+GTKColorChooserPanel.hueMnemonic=72
 
-GTKColorChooserPanel.redText=Rouge\u00a0:
-GTKColorChooserPanel.redMnemonic=82
+GTKColorChooserPanel.redText=Rouge\u00A0:
+GTKColorChooserPanel.redMnemonic=69
 
-GTKColorChooserPanel.saturationText=Saturation\u00a0:
+GTKColorChooserPanel.saturationText=Saturation\u00A0:
 GTKColorChooserPanel.saturationMnemonic=83
 
-GTKColorChooserPanel.greenText=Vert\u00a0:
-GTKColorChooserPanel.greenMnemonic=69
+GTKColorChooserPanel.greenText=Vert\u00A0:
+GTKColorChooserPanel.greenMnemonic=71
 
-GTKColorChooserPanel.valueText=Valeur\u00a0:
+GTKColorChooserPanel.valueText=Valeur\u00A0:
 GTKColorChooserPanel.valueMnemonic=86
 
-GTKColorChooserPanel.blueText=Bleu\u00a0:
+GTKColorChooserPanel.blueText=Bleu\u00A0:
 GTKColorChooserPanel.blueMnemonic=66
 
-GTKColorChooserPanel.colorNameText=Nom de la couleur\u00a0:
+GTKColorChooserPanel.colorNameText=Nom de la couleur\u00A0:
 GTKColorChooserPanel.colorNameMnemonic=78
 
 
@@ -48,34 +48,34 @@
 FileChooser.acceptAllFileFilterText=Tous les fichiers
 FileChooser.newFolderButtonText=Nouveau dossier
 FileChooser.newFolderButtonMnemonic=78
-FileChooser.newFolderDialogText=Nom de dossier:
-FileChooser.newFolderNoDirectoryErrorTitleText=Error
-FileChooser.newFolderNoDirectoryErrorText=Error creating directory "{0}": No such file or directory
+FileChooser.newFolderDialogText=Nom du dossier :
+FileChooser.newFolderNoDirectoryErrorTitleText=Erreur
+FileChooser.newFolderNoDirectoryErrorText=Erreur lors de la cr\u00E9ation du r\u00E9pertoire "{0}" : ce fichier ou r\u00E9pertoire n''existe pas
 FileChooser.deleteFileButtonText=Supprimer le fichier
 FileChooser.deleteFileButtonMnemonic=76
 FileChooser.renameFileButtonText=Renommer le fichier
 FileChooser.renameFileButtonMnemonic=82
 FileChooser.cancelButtonText=Annuler
-FileChooser.cancelButtonMnemonic=70
-FileChooser.saveButtonText=Enregistrer
+FileChooser.cancelButtonMnemonic=67
+FileChooser.saveButtonText=OK
 FileChooser.saveButtonMnemonic=79
 FileChooser.openButtonText=OK
 FileChooser.openButtonMnemonic=79
 FileChooser.saveDialogTitleText=Enregistrer
 FileChooser.openDialogTitleText=Ouvrir
-FileChooser.pathLabelText=S\u00e9lection\u00a0:
+FileChooser.pathLabelText=S\u00E9lection\u00A0:
 FileChooser.filterLabelText=Filtre :
 FileChooser.pathLabelMnemonic=83
 FileChooser.foldersLabelText=Dossiers
-FileChooser.foldersLabelMnemonic=71
+FileChooser.foldersLabelMnemonic=68
 FileChooser.filesLabelText=Fichiers
 FileChooser.filesLabelMnemonic=70
 
-FileChooser.cancelButtonToolTipText=Abandonner la bo\u00eete de dialogue du s\u00e9lectionneur de fichier.
-FileChooser.saveButtonToolTipText=Enregistrer le fichier s\u00e9lectionn\u00e9.
-FileChooser.openButtonToolTipText=Ouvrir le fichier s\u00e9lectionn\u00e9.
+FileChooser.cancelButtonToolTipText=Ferme la bo\u00EEte de dialogue du s\u00E9lecteur de fichiers.
+FileChooser.saveButtonToolTipText=Enregistre le fichier s\u00E9lectionn\u00E9.
+FileChooser.openButtonToolTipText=Ouvre le fichier s\u00E9lectionn\u00E9.
 
-FileChooser.renameFileDialogText=Renommer le fichier "{0}" en
+FileChooser.renameFileDialogText=Renomme le fichier "{0}" en
 FileChooser.renameFileErrorTitle=Erreur 
 FileChooser.renameFileErrorText=Erreur lors du changement de nom du fichier "{0}" en "{1}"
 
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -20,17 +20,17 @@
 # GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second
 # character of GTKColorChooserPanel.hueText should be underlined to
 # represent the mnemonic.
-GTKColorChooserPanel.hueText=Tonalit\u00e0:
-GTKColorChooserPanel.hueMnemonic=84
+GTKColorChooserPanel.hueText=Tonalit\u00E0:
+GTKColorChooserPanel.hueMnemonic=72
 
 GTKColorChooserPanel.redText=Rosso:
-GTKColorChooserPanel.redMnemonic=82
+GTKColorChooserPanel.redMnemonic=69
 
 GTKColorChooserPanel.saturationText=Saturazione:
 GTKColorChooserPanel.saturationMnemonic=83
 
 GTKColorChooserPanel.greenText=Verde:
-GTKColorChooserPanel.greenMnemonic=69
+GTKColorChooserPanel.greenMnemonic=71
 
 GTKColorChooserPanel.valueText=Valore:
 GTKColorChooserPanel.valueMnemonic=86
@@ -49,16 +49,16 @@
 FileChooser.newFolderButtonText=Nuova cartella
 FileChooser.newFolderButtonMnemonic=78
 FileChooser.newFolderDialogText=Nome della cartella:
-FileChooser.newFolderNoDirectoryErrorTitleText=Error
-FileChooser.newFolderNoDirectoryErrorText=Error creating directory "{0}": No such file or directory
+FileChooser.newFolderNoDirectoryErrorTitleText=Errore
+FileChooser.newFolderNoDirectoryErrorText=Errore durante la creazione della directory "{0}": file o directory inesistente
 FileChooser.deleteFileButtonText=Elimina file
 FileChooser.deleteFileButtonMnemonic=76
 FileChooser.renameFileButtonText=Rinomina file
 FileChooser.renameFileButtonMnemonic=82
 FileChooser.cancelButtonText=Annulla
 FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=Salva
-FileChooser.saveButtonMnemonic=82
+FileChooser.saveButtonText=OK
+FileChooser.saveButtonMnemonic=79
 FileChooser.openButtonText=OK
 FileChooser.openButtonMnemonic=79
 FileChooser.saveDialogTitleText=Salva
@@ -67,17 +67,17 @@
 FileChooser.filterLabelText=Filtro:
 FileChooser.pathLabelMnemonic=83
 FileChooser.foldersLabelText=Cartelle
-FileChooser.foldersLabelMnemonic=79
+FileChooser.foldersLabelMnemonic=68
 FileChooser.filesLabelText=File
 FileChooser.filesLabelMnemonic=70
 
-FileChooser.cancelButtonToolTipText=Chiude la finestra di dialogo di selezione colore.
+FileChooser.cancelButtonToolTipText=Chiude la finestra di dialogo di selezione file.
 FileChooser.saveButtonToolTipText=Salva il file selezionato.
 FileChooser.openButtonToolTipText=Apre il file selezionato.
 
-FileChooser.renameFileDialogText=Rinomina del file "{0}" in
+FileChooser.renameFileDialogText=Rinomina file "{0}" in
 FileChooser.renameFileErrorTitle=Errore 
-FileChooser.renameFileErrorText=Errore nella rinomina del file "{0}" in "{1}"
+FileChooser.renameFileErrorText=Errore durante la ridenominazione del file "{0}" in "{1}"
 
 OptionPane.okButtonMnemonic=79
 OptionPane.cancelButtonMnemonic=67
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -6,7 +6,7 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.nameText=GTK \u30ab\u30e9\u30fc\u30c1\u30e5\u30fc\u30b6
+GTKColorChooserPanel.nameText=GTK\u30AB\u30E9\u30FC\u30FB\u30C1\u30E5\u30FC\u30B6
 # mnemonic as a VK_ constant
 GTKColorChooserPanel.mnemonic=71
 # Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you
@@ -20,64 +20,64 @@
 # GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second
 # character of GTKColorChooserPanel.hueText should be underlined to
 # represent the mnemonic.
-GTKColorChooserPanel.hueText=\u8272\u5408\u3044(H):
+GTKColorChooserPanel.hueText=\u8272\u76F8:
 GTKColorChooserPanel.hueMnemonic=72
 
-GTKColorChooserPanel.redText=\u8d64(E):
+GTKColorChooserPanel.redText=\u8D64:
 GTKColorChooserPanel.redMnemonic=69
 
-GTKColorChooserPanel.saturationText=\u5f69\u5ea6(S):
+GTKColorChooserPanel.saturationText=\u5F69\u5EA6:
 GTKColorChooserPanel.saturationMnemonic=83
 
-GTKColorChooserPanel.greenText=\u7dd1(G):
+GTKColorChooserPanel.greenText=\u7DD1:
 GTKColorChooserPanel.greenMnemonic=71
 
-GTKColorChooserPanel.valueText=\u5024(V):
+GTKColorChooserPanel.valueText=\u5024:
 GTKColorChooserPanel.valueMnemonic=86
 
-GTKColorChooserPanel.blueText=\u9752(B):
+GTKColorChooserPanel.blueText=\u9752:
 GTKColorChooserPanel.blueMnemonic=66
 
-GTKColorChooserPanel.colorNameText=\u8272\u540d(N):
+GTKColorChooserPanel.colorNameText=\u8272\u540D:
 GTKColorChooserPanel.colorNameMnemonic=78
 
 
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.acceptAllFileFilterText=\u3059\u3079\u3066\u306e\u30d5\u30a1\u30a4\u30eb
-FileChooser.newFolderButtonText=\u65b0\u898f\u30d5\u30a9\u30eb\u30c0
+FileChooser.acceptAllFileFilterText=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB
+FileChooser.newFolderButtonText=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
 FileChooser.newFolderButtonMnemonic=78
-FileChooser.newFolderDialogText=\u30d5\u30a9\u30eb\u30c0\u540d:
-FileChooser.newFolderNoDirectoryErrorTitleText=Error
-FileChooser.newFolderNoDirectoryErrorText=Error creating directory "{0}": No such file or directory
-FileChooser.deleteFileButtonText=\u30d5\u30a1\u30a4\u30eb\u3092\u524a\u9664
+FileChooser.newFolderDialogText=\u30D5\u30A9\u30EB\u30C0\u540D:
+FileChooser.newFolderNoDirectoryErrorTitleText=\u30A8\u30E9\u30FC
+FileChooser.newFolderNoDirectoryErrorText=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA"{0}"\u306E\u4F5C\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: \u3053\u306E\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
+FileChooser.deleteFileButtonText=\u30D5\u30A1\u30A4\u30EB\u306E\u524A\u9664
 FileChooser.deleteFileButtonMnemonic=76
-FileChooser.renameFileButtonText=\u30d5\u30a1\u30a4\u30eb\u540d\u3092\u5909\u66f4
+FileChooser.renameFileButtonText=\u30D5\u30A1\u30A4\u30EB\u306E\u540D\u524D\u5909\u66F4
 FileChooser.renameFileButtonMnemonic=82
-FileChooser.cancelButtonText=\u53d6\u6d88\u3057
+FileChooser.cancelButtonText=\u53D6\u6D88
 FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=\u4fdd\u5b58
+FileChooser.saveButtonText=OK
 FileChooser.saveButtonMnemonic=79
-FileChooser.openButtonText=\u4e86\u89e3
+FileChooser.openButtonText=OK
 FileChooser.openButtonMnemonic=79
-FileChooser.saveDialogTitleText=\u4fdd\u5b58
-FileChooser.openDialogTitleText=\u958b\u304f
-FileChooser.pathLabelText=\u9078\u629e:
-FileChooser.filterLabelText=\u30d5\u30a3\u30eb\u30bf:
+FileChooser.saveDialogTitleText=\u4FDD\u5B58
+FileChooser.openDialogTitleText=\u958B\u304F
+FileChooser.pathLabelText=\u9078\u629E:
+FileChooser.filterLabelText=\u30D5\u30A3\u30EB\u30BF:
 FileChooser.pathLabelMnemonic=83
-FileChooser.foldersLabelText=\u30d5\u30a9\u30eb\u30c0
+FileChooser.foldersLabelText=\u30D5\u30A9\u30EB\u30C0
 FileChooser.foldersLabelMnemonic=68
-FileChooser.filesLabelText=\u30d5\u30a1\u30a4\u30eb
+FileChooser.filesLabelText=\u30D5\u30A1\u30A4\u30EB
 FileChooser.filesLabelMnemonic=70
 
-FileChooser.cancelButtonToolTipText=\u30d5\u30a1\u30a4\u30eb\u30c1\u30e5\u30fc\u30b6\u30c0\u30a4\u30a2\u30ed\u30b0\u3092\u5f37\u5236\u7d42\u4e86
-FileChooser.saveButtonToolTipText=\u9078\u629e\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u4fdd\u5b58
-FileChooser.openButtonToolTipText=\u9078\u629e\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u958b\u304f
+FileChooser.cancelButtonToolTipText=\u30D5\u30A1\u30A4\u30EB\u30FB\u30C1\u30E5\u30FC\u30B6\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u7D42\u4E86\u3057\u307E\u3059\u3002
+FileChooser.saveButtonToolTipText=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3057\u307E\u3059\u3002
+FileChooser.openButtonToolTipText=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304D\u307E\u3059\u3002
 
-FileChooser.renameFileDialogText=\u30d5\u30a1\u30a4\u30eb "{0}" \u306e\u540d\u524d\u3092\u5909\u66f4:
-FileChooser.renameFileErrorTitle=\u30a8\u30e9\u30fc 
-FileChooser.renameFileErrorText=\u30d5\u30a1\u30a4\u30eb "{0}" \u3092 "{1}" \u3078\u5909\u66f4\u6642\u306b\u30a8\u30e9\u30fc
+FileChooser.renameFileDialogText=\u30D5\u30A1\u30A4\u30EB"{0}"\u3092\u6B21\u306E\u540D\u524D\u306B\u5909\u66F4:
+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
 
 OptionPane.okButtonMnemonic=79
 OptionPane.cancelButtonMnemonic=67
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -6,7 +6,7 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.nameText=GTK \uc0c9 \uc120\ud0dd
+GTKColorChooserPanel.nameText=GTK \uC0C9\uC0C1 \uC120\uD0DD\uAE30
 # mnemonic as a VK_ constant
 GTKColorChooserPanel.mnemonic=71
 # Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you
@@ -20,64 +20,64 @@
 # GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second
 # character of GTKColorChooserPanel.hueText should be underlined to
 # represent the mnemonic.
-GTKColorChooserPanel.hueText=\uc0c9\uc0c1(H):
+GTKColorChooserPanel.hueText=\uC0C9\uC870:
 GTKColorChooserPanel.hueMnemonic=72
 
-GTKColorChooserPanel.redText=\ube68\uac15(E):
+GTKColorChooserPanel.redText=\uBE68\uAC04\uC0C9:
 GTKColorChooserPanel.redMnemonic=69
 
-GTKColorChooserPanel.saturationText=\ucc44\ub3c4(S):
+GTKColorChooserPanel.saturationText=\uCC44\uB3C4:
 GTKColorChooserPanel.saturationMnemonic=83
 
-GTKColorChooserPanel.greenText=\ub179\uc0c9(G):
+GTKColorChooserPanel.greenText=\uB179\uC0C9:
 GTKColorChooserPanel.greenMnemonic=71
 
-GTKColorChooserPanel.valueText=\uac12(V):
+GTKColorChooserPanel.valueText=\uAC12:
 GTKColorChooserPanel.valueMnemonic=86
 
-GTKColorChooserPanel.blueText=\ud30c\ub791(B):
+GTKColorChooserPanel.blueText=\uD30C\uB780\uC0C9:
 GTKColorChooserPanel.blueMnemonic=66
 
-GTKColorChooserPanel.colorNameText=\uc0c9 \uc774\ub984(N):
+GTKColorChooserPanel.colorNameText=\uC0C9\uC0C1 \uC774\uB984:
 GTKColorChooserPanel.colorNameMnemonic=78
 
 
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.acceptAllFileFilterText=\ubaa8\ub4e0 \ud30c\uc77c
-FileChooser.newFolderButtonText=\uc0c8 \ud3f4\ub354
+FileChooser.acceptAllFileFilterText=\uBAA8\uB4E0 \uD30C\uC77C
+FileChooser.newFolderButtonText=\uC0C8 \uD3F4\uB354
 FileChooser.newFolderButtonMnemonic=78
-FileChooser.newFolderDialogText=\ud3f4\ub354 \uc774\ub984:
-FileChooser.newFolderNoDirectoryErrorTitleText=Error
-FileChooser.newFolderNoDirectoryErrorText=Error creating directory "{0}": No such file or directory
-FileChooser.deleteFileButtonText=\ud30c\uc77c \uc0ad\uc81c
+FileChooser.newFolderDialogText=\uD3F4\uB354 \uC774\uB984:
+FileChooser.newFolderNoDirectoryErrorTitleText=\uC624\uB958
+FileChooser.newFolderNoDirectoryErrorText="{0}" \uB514\uB809\uD1A0\uB9AC\uB97C \uC0DD\uC131\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD: \uD574\uB2F9 \uD30C\uC77C \uB610\uB294 \uB514\uB809\uD1A0\uB9AC\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.
+FileChooser.deleteFileButtonText=\uD30C\uC77C \uC0AD\uC81C
 FileChooser.deleteFileButtonMnemonic=76
-FileChooser.renameFileButtonText=\ud30c\uc77c \uc774\ub984 \ubc14\uafb8\uae30
+FileChooser.renameFileButtonText=\uD30C\uC77C \uC774\uB984 \uBC14\uAFB8\uAE30
 FileChooser.renameFileButtonMnemonic=82
-FileChooser.cancelButtonText=\ucde8\uc18c
+FileChooser.cancelButtonText=\uCDE8\uC18C
 FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=\uc800\uc7a5
+FileChooser.saveButtonText=\uD655\uC778
 FileChooser.saveButtonMnemonic=79
-FileChooser.openButtonText=\ud655\uc778
+FileChooser.openButtonText=\uD655\uC778
 FileChooser.openButtonMnemonic=79
-FileChooser.saveDialogTitleText=\uc800\uc7a5
-FileChooser.openDialogTitleText=\uc5f4\uae30
-FileChooser.pathLabelText=\uc120\ud0dd:
-FileChooser.filterLabelText=\ud544\ud130:
+FileChooser.saveDialogTitleText=\uC800\uC7A5
+FileChooser.openDialogTitleText=\uC5F4\uAE30
+FileChooser.pathLabelText=\uC120\uD0DD:
+FileChooser.filterLabelText=\uD544\uD130:
 FileChooser.pathLabelMnemonic=83
-FileChooser.foldersLabelText=\ud3f4\ub354
+FileChooser.foldersLabelText=\uD3F4\uB354
 FileChooser.foldersLabelMnemonic=68
-FileChooser.filesLabelText=\ud30c\uc77c
+FileChooser.filesLabelText=\uD30C\uC77C
 FileChooser.filesLabelMnemonic=70
 
-FileChooser.cancelButtonToolTipText=\ud30c\uc77c \uc120\ud0dd \ub300\ud654 \uc0c1\uc790\ub97c \uc911\ub2e8\ud569\ub2c8\ub2e4.
-FileChooser.saveButtonToolTipText=\uc120\ud0dd\ud55c \ud30c\uc77c\uc744 \uc800\uc7a5\ud569\ub2c8\ub2e4.
-FileChooser.openButtonToolTipText=\uc120\ud0dd\ud55c \ud30c\uc77c\uc744 \uc5fd\ub2c8\ub2e4.
+FileChooser.cancelButtonToolTipText=\uD30C\uC77C \uC120\uD0DD\uAE30 \uB300\uD654\uC0C1\uC790\uB97C \uC911\uB2E8\uD569\uB2C8\uB2E4.
+FileChooser.saveButtonToolTipText=\uC120\uD0DD\uB41C \uD30C\uC77C\uC744 \uC800\uC7A5\uD569\uB2C8\uB2E4.
+FileChooser.openButtonToolTipText=\uC120\uD0DD\uB41C \uD30C\uC77C\uC744 \uC5FD\uB2C8\uB2E4.
 
-FileChooser.renameFileDialogText=\ud30c\uc77c "{0}"\uc744 \ub2e4\uc74c\uc73c\ub85c \uc774\ub984 \ubc14\uafb8\uae30
-FileChooser.renameFileErrorTitle=\uc624\ub958 
-FileChooser.renameFileErrorText="{0}"\uc5d0\uc11c "{1}"\ub85c \uc774\ub984 \ubc14\uafb8\uae30 \uc624\ub958
+FileChooser.renameFileDialogText="{0}" \uD30C\uC77C\uC758 \uC774\uB984 \uBC14\uAFB8\uAE30
+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.
 
 OptionPane.okButtonMnemonic=79
 OptionPane.cancelButtonMnemonic=67
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -6,7 +6,7 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.nameText=Seletor de cores do GTK
+GTKColorChooserPanel.nameText=Seletor de Cores do GTK
 # mnemonic as a VK_ constant
 GTKColorChooserPanel.mnemonic=71
 # Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you
@@ -26,7 +26,7 @@
 GTKColorChooserPanel.redText=Vermelho:
 GTKColorChooserPanel.redMnemonic=69
 
-GTKColorChooserPanel.saturationText=Satura\u00e7\u00e3o:
+GTKColorChooserPanel.saturationText=Satura\u00E7\u00E3o:
 GTKColorChooserPanel.saturationMnemonic=83
 
 GTKColorChooserPanel.greenText=Verde:
@@ -38,20 +38,22 @@
 GTKColorChooserPanel.blueText=Azul:
 GTKColorChooserPanel.blueMnemonic=66
 
-GTKColorChooserPanel.colorNameText=Nome da cor:
+GTKColorChooserPanel.colorNameText=Nome da Cor:
 GTKColorChooserPanel.colorNameMnemonic=78
 
 
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.acceptAllFileFilterText=Todos os arquivos
-FileChooser.newFolderButtonText=Nova pasta
+FileChooser.acceptAllFileFilterText=Todos os Arquivos
+FileChooser.newFolderButtonText=Nova Pasta
 FileChooser.newFolderButtonMnemonic=78
 FileChooser.newFolderDialogText=Nome da pasta:
-FileChooser.deleteFileButtonText=Excluir arquivo
+FileChooser.newFolderNoDirectoryErrorTitleText=Erro
+FileChooser.newFolderNoDirectoryErrorText=Erro ao criar o diret\u00F3rio "{0}": N\u00E3o h\u00E1 arquivo ou diret\u00F3rio
+FileChooser.deleteFileButtonText=Deletar Arquivo
 FileChooser.deleteFileButtonMnemonic=76
-FileChooser.renameFileButtonText=Renomear arquivo
+FileChooser.renameFileButtonText=Renomear Arquivo
 FileChooser.renameFileButtonMnemonic=82
 FileChooser.cancelButtonText=Cancelar
 FileChooser.cancelButtonMnemonic=67
@@ -61,7 +63,7 @@
 FileChooser.openButtonMnemonic=79
 FileChooser.saveDialogTitleText=Salvar
 FileChooser.openDialogTitleText=Abrir
-FileChooser.pathLabelText=Sele\u00e7\u00e3o:
+FileChooser.pathLabelText=Sele\u00E7\u00E3o:
 FileChooser.filterLabelText=Filtro:
 FileChooser.pathLabelMnemonic=83
 FileChooser.foldersLabelText=Pastas
@@ -69,7 +71,7 @@
 FileChooser.filesLabelText=Arquivos
 FileChooser.filesLabelMnemonic=70
 
-FileChooser.cancelButtonToolTipText=Anular caixa de di\u00e1logo do seletor de arquivos.
+FileChooser.cancelButtonToolTipText=Abortar caixa de di\u00E1logo do seletor de arquivos.
 FileChooser.saveButtonToolTipText=Salvar arquivo selecionado.
 FileChooser.openButtonToolTipText=Abrir arquivo selecionado.
 
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -6,7 +6,7 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.nameText=GTK F\u00e4rgv\u00e4ljaren
+GTKColorChooserPanel.nameText=GTK-f\u00E4rgv\u00E4ljaren
 # mnemonic as a VK_ constant
 GTKColorChooserPanel.mnemonic=71
 # Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you
@@ -21,25 +21,25 @@
 # character of GTKColorChooserPanel.hueText should be underlined to
 # represent the mnemonic.
 GTKColorChooserPanel.hueText=Nyans:
-GTKColorChooserPanel.hueMnemonic=78
+GTKColorChooserPanel.hueMnemonic=72
 
-GTKColorChooserPanel.redText=R\u00f6d:
-GTKColorChooserPanel.redMnemonic=82
+GTKColorChooserPanel.redText=R\u00F6d:
+GTKColorChooserPanel.redMnemonic=69
 
-GTKColorChooserPanel.saturationText=M\u00e4ttnad:
-GTKColorChooserPanel.saturationMnemonic=77
+GTKColorChooserPanel.saturationText=M\u00E4ttnad:
+GTKColorChooserPanel.saturationMnemonic=83
 
-GTKColorChooserPanel.greenText=Gr\u00f6n:
+GTKColorChooserPanel.greenText=Gr\u00F6n:
 GTKColorChooserPanel.greenMnemonic=71
 
-GTKColorChooserPanel.valueText=V\u00e4rde:
+GTKColorChooserPanel.valueText=V\u00E4rde:
 GTKColorChooserPanel.valueMnemonic=86
 
-GTKColorChooserPanel.blueText=Bl\u00e5:
+GTKColorChooserPanel.blueText=Bl\u00E5:
 GTKColorChooserPanel.blueMnemonic=66
 
-GTKColorChooserPanel.colorNameText=F\u00e4rgnamn:
-GTKColorChooserPanel.colorNameMnemonic=70
+GTKColorChooserPanel.colorNameText=F\u00E4rg:
+GTKColorChooserPanel.colorNameMnemonic=78
 
 
 
@@ -47,37 +47,37 @@
 
 FileChooser.acceptAllFileFilterText=Alla filer
 FileChooser.newFolderButtonText=Ny mapp
-FileChooser.newFolderButtonMnemonic=70
+FileChooser.newFolderButtonMnemonic=78
 FileChooser.newFolderDialogText=Mapp:
-FileChooser.newFolderNoDirectoryErrorTitleText=Error
-FileChooser.newFolderNoDirectoryErrorText=Error creating directory "{0}": No such file or directory
+FileChooser.newFolderNoDirectoryErrorTitleText=Fel
+FileChooser.newFolderNoDirectoryErrorText=Ett fel intr\u00E4ffade vid f\u00F6rs\u00F6k att skapa katalogen "{0}": Filen eller katalogen finns inte
 FileChooser.deleteFileButtonText=Ta bort fil
 FileChooser.deleteFileButtonMnemonic=76
-FileChooser.renameFileButtonText=Byt namn p\u00e5 fil
-FileChooser.renameFileButtonMnemonic=84
+FileChooser.renameFileButtonText=Namn\u00E4ndra fil
+FileChooser.renameFileButtonMnemonic=82
 FileChooser.cancelButtonText=Avbryt
-FileChooser.cancelButtonMnemonic=83
-FileChooser.saveButtonText=Spara
-FileChooser.saveButtonMnemonic=80
+FileChooser.cancelButtonMnemonic=67
+FileChooser.saveButtonText=OK
+FileChooser.saveButtonMnemonic=79
 FileChooser.openButtonText=OK
 FileChooser.openButtonMnemonic=79
 FileChooser.saveDialogTitleText=Spara
-FileChooser.openDialogTitleText=\u00d6ppna
-FileChooser.pathLabelText=Markeringen:
+FileChooser.openDialogTitleText=\u00D6ppna
+FileChooser.pathLabelText=Val:
 FileChooser.filterLabelText=Filter:
-FileChooser.pathLabelMnemonic=77
+FileChooser.pathLabelMnemonic=83
 FileChooser.foldersLabelText=Mappar
-FileChooser.foldersLabelMnemonic=82
+FileChooser.foldersLabelMnemonic=68
 FileChooser.filesLabelText=Filer
 FileChooser.filesLabelMnemonic=70
 
-FileChooser.cancelButtonToolTipText=St\u00e4ng dialogrutan f\u00f6r filval.
-FileChooser.saveButtonToolTipText=Spara den markerade filen.
-FileChooser.openButtonToolTipText=\u00d6ppna den markerade filen.
+FileChooser.cancelButtonToolTipText=Avbryt dialogrutan Filv\u00E4ljare.
+FileChooser.saveButtonToolTipText=Spara vald fil.
+FileChooser.openButtonToolTipText=\u00D6ppna vald fil.
 
-FileChooser.renameFileDialogText=Byt namn p\u00e5 fil "{0}" till
+FileChooser.renameFileDialogText=Namn\u00E4ndra fil "{0}" till
 FileChooser.renameFileErrorTitle=Fel 
-FileChooser.renameFileErrorText=Det gick inte att byta namn p\u00e5 fil "{0}" till "{1}"
+FileChooser.renameFileErrorText=Fel vid namn\u00E4ndring av fil "{0}" till "{1}"
 
 OptionPane.okButtonMnemonic=79
-OptionPane.cancelButtonMnemonic=83
+OptionPane.cancelButtonMnemonic=67
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -6,7 +6,7 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.nameText=GTK Color Chooser
+GTKColorChooserPanel.nameText=GTK \u989C\u8272\u9009\u62E9\u5668
 # mnemonic as a VK_ constant
 GTKColorChooserPanel.mnemonic=71
 # Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you
@@ -20,64 +20,64 @@
 # GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second
 # character of GTKColorChooserPanel.hueText should be underlined to
 # represent the mnemonic.
-GTKColorChooserPanel.hueText=\u8272\u8c03(H)\uff1a
+GTKColorChooserPanel.hueText=\u8272\u8C03: 
 GTKColorChooserPanel.hueMnemonic=72
 
-GTKColorChooserPanel.redText=\u7ea2(E)\uff1a
+GTKColorChooserPanel.redText=\u7EA2: 
 GTKColorChooserPanel.redMnemonic=69
 
-GTKColorChooserPanel.saturationText=\u9971\u548c\u5ea6(S)\uff1a
+GTKColorChooserPanel.saturationText=\u9971\u548C\u5EA6: 
 GTKColorChooserPanel.saturationMnemonic=83
 
-GTKColorChooserPanel.greenText=\u7eff(G)\uff1a
+GTKColorChooserPanel.greenText=\u7EFF: 
 GTKColorChooserPanel.greenMnemonic=71
 
-GTKColorChooserPanel.valueText=\u503c(V)\uff1a
+GTKColorChooserPanel.valueText=\u503C: 
 GTKColorChooserPanel.valueMnemonic=86
 
-GTKColorChooserPanel.blueText=\u84dd(B)\uff1a
+GTKColorChooserPanel.blueText=\u84DD: 
 GTKColorChooserPanel.blueMnemonic=66
 
-GTKColorChooserPanel.colorNameText=\u989c\u8272\u540d\u79f0(N)\uff1a
+GTKColorChooserPanel.colorNameText=\u989C\u8272\u540D\u79F0: 
 GTKColorChooserPanel.colorNameMnemonic=78
 
 
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.acceptAllFileFilterText=\u6240\u6709\u6587\u4ef6
-FileChooser.newFolderButtonText=\u65b0\u5efa\u6587\u4ef6\u5939
+FileChooser.acceptAllFileFilterText=\u6240\u6709\u6587\u4EF6
+FileChooser.newFolderButtonText=\u65B0\u5EFA\u6587\u4EF6\u5939
 FileChooser.newFolderButtonMnemonic=78
-FileChooser.newFolderDialogText=\u6587\u4ef6\u5939\u540d\uff1a
-FileChooser.newFolderNoDirectoryErrorTitleText=Error
-FileChooser.newFolderNoDirectoryErrorText=Error creating directory "{0}": No such file or directory
-FileChooser.deleteFileButtonText=\u5220\u9664\u6587\u4ef6
+FileChooser.newFolderDialogText=\u6587\u4EF6\u5939\u540D: 
+FileChooser.newFolderNoDirectoryErrorTitleText=\u9519\u8BEF
+FileChooser.newFolderNoDirectoryErrorText=\u521B\u5EFA\u76EE\u5F55 "{0}" \u65F6\u51FA\u9519: \u6CA1\u6709\u6B64\u7C7B\u6587\u4EF6\u6216\u76EE\u5F55
+FileChooser.deleteFileButtonText=\u5220\u9664\u6587\u4EF6
 FileChooser.deleteFileButtonMnemonic=76
-FileChooser.renameFileButtonText=\u91cd\u547d\u540d\u6587\u4ef6
+FileChooser.renameFileButtonText=\u91CD\u547D\u540D\u6587\u4EF6
 FileChooser.renameFileButtonMnemonic=82
-FileChooser.cancelButtonText=\u53d6\u6d88
+FileChooser.cancelButtonText=\u53D6\u6D88
 FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=\u4fdd\u5b58
+FileChooser.saveButtonText=\u786E\u5B9A
 FileChooser.saveButtonMnemonic=79
-FileChooser.openButtonText=\u786e\u5b9a
+FileChooser.openButtonText=\u786E\u5B9A
 FileChooser.openButtonMnemonic=79
-FileChooser.saveDialogTitleText=\u4fdd\u5b58
-FileChooser.openDialogTitleText=\u6253\u5f00
-FileChooser.pathLabelText=\u9009\u62e9\uff1a
-FileChooser.filterLabelText=\u8fc7\u6ee4\u5668\uff1a
+FileChooser.saveDialogTitleText=\u4FDD\u5B58
+FileChooser.openDialogTitleText=\u6253\u5F00
+FileChooser.pathLabelText=\u9009\u62E9: 
+FileChooser.filterLabelText=\u7B5B\u9009\u5668: 
 FileChooser.pathLabelMnemonic=83
-FileChooser.foldersLabelText=\u6587\u4ef6\u5939
+FileChooser.foldersLabelText=\u6587\u4EF6\u5939
 FileChooser.foldersLabelMnemonic=68
-FileChooser.filesLabelText=\u6587\u4ef6
+FileChooser.filesLabelText=\u6587\u4EF6
 FileChooser.filesLabelMnemonic=70
 
-FileChooser.cancelButtonToolTipText=\u7ec8\u6b62\u6587\u4ef6\u9009\u62e9\u5668\u5bf9\u8bdd\u6846\u3002
-FileChooser.saveButtonToolTipText=\u4fdd\u5b58\u9009\u5b9a\u7684\u6587\u4ef6\u3002
-FileChooser.openButtonToolTipText=\u6253\u5f00\u9009\u5b9a\u7684\u6587\u4ef6\u3002
+FileChooser.cancelButtonToolTipText=\u4E2D\u6B62\u6587\u4EF6\u9009\u62E9\u5668\u5BF9\u8BDD\u6846\u3002
+FileChooser.saveButtonToolTipText=\u4FDD\u5B58\u6240\u9009\u6587\u4EF6\u3002
+FileChooser.openButtonToolTipText=\u6253\u5F00\u6240\u9009\u6587\u4EF6\u3002
 
-FileChooser.renameFileDialogText=\u5c06\u6587\u4ef6\u201c{0}\u201d\u91cd\u547d\u540d\u4e3a
-FileChooser.renameFileErrorTitle=\u9519\u8bef 
-FileChooser.renameFileErrorText=\u5c06\u6587\u4ef6\u201c{0}\u201d\u91cd\u547d\u540d\u4e3a\u201c{1}\u201d\u65f6\u51fa\u9519
+FileChooser.renameFileDialogText=\u5C06\u6587\u4EF6 "{0}" \u91CD\u547D\u540D\u4E3A
+FileChooser.renameFileErrorTitle=\u9519\u8BEF 
+FileChooser.renameFileErrorText=\u5C06\u6587\u4EF6 "{0}" \u91CD\u547D\u540D\u4E3A "{1}" \u65F6\u51FA\u9519
 
 OptionPane.okButtonMnemonic=79
 OptionPane.cancelButtonMnemonic=67
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -6,7 +6,7 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.nameText=GTK Color Chooser
+GTKColorChooserPanel.nameText=GTK \u8272\u5F69\u9078\u64C7\u5668
 # mnemonic as a VK_ constant
 GTKColorChooserPanel.mnemonic=71
 # Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you
@@ -20,64 +20,64 @@
 # GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second
 # character of GTKColorChooserPanel.hueText should be underlined to
 # represent the mnemonic.
-GTKColorChooserPanel.hueText=\u8272\u8abf(H):
+GTKColorChooserPanel.hueText=\u8272\u8ABF:
 GTKColorChooserPanel.hueMnemonic=72
 
-GTKColorChooserPanel.redText=\u7d05(E):
+GTKColorChooserPanel.redText=\u7D05:
 GTKColorChooserPanel.redMnemonic=69
 
-GTKColorChooserPanel.saturationText=\u98fd\u548c(S):
+GTKColorChooserPanel.saturationText=\u98FD\u548C:
 GTKColorChooserPanel.saturationMnemonic=83
 
-GTKColorChooserPanel.greenText=\u7da0(G):
+GTKColorChooserPanel.greenText=\u7DA0:
 GTKColorChooserPanel.greenMnemonic=71
 
-GTKColorChooserPanel.valueText=\u503c(V):
+GTKColorChooserPanel.valueText=\u503C:
 GTKColorChooserPanel.valueMnemonic=86
 
-GTKColorChooserPanel.blueText=\u85cd(B):
+GTKColorChooserPanel.blueText=\u85CD:
 GTKColorChooserPanel.blueMnemonic=66
 
-GTKColorChooserPanel.colorNameText=\u984f\u8272\u540d\u7a31(N):
+GTKColorChooserPanel.colorNameText=\u984F\u8272\u540D\u7A31:
 GTKColorChooserPanel.colorNameMnemonic=78
 
 
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.acceptAllFileFilterText=\u6240\u6709\u6a94\u6848
-FileChooser.newFolderButtonText=\u65b0\u6a94\u6848\u593e
+FileChooser.acceptAllFileFilterText=\u6240\u6709\u6A94\u6848
+FileChooser.newFolderButtonText=\u65B0\u8CC7\u6599\u593E
 FileChooser.newFolderButtonMnemonic=78
-FileChooser.newFolderDialogText=\u6a94\u6848\u593e\u540d\u7a31:
-FileChooser.newFolderNoDirectoryErrorTitleText=Error
-FileChooser.newFolderNoDirectoryErrorText=Error creating directory "{0}": No such file or directory
-FileChooser.deleteFileButtonText=\u522a\u9664\u6a94\u6848
+FileChooser.newFolderDialogText=\u8CC7\u6599\u593E\u540D\u7A31:
+FileChooser.newFolderNoDirectoryErrorTitleText=\u932F\u8AA4
+FileChooser.newFolderNoDirectoryErrorText=\u5EFA\u7ACB\u76EE\u9304 "{0}" \u6642\u767C\u751F\u932F\u8AA4: \u6C92\u6709\u6B64\u6A94\u6848\u6216\u76EE\u9304
+FileChooser.deleteFileButtonText=\u522A\u9664\u6A94\u6848
 FileChooser.deleteFileButtonMnemonic=76
-FileChooser.renameFileButtonText=\u91cd\u65b0\u547d\u540d\u6a94\u6848
+FileChooser.renameFileButtonText=\u91CD\u65B0\u547D\u540D\u6A94\u6848
 FileChooser.renameFileButtonMnemonic=82
-FileChooser.cancelButtonText=\u53d6\u6d88
+FileChooser.cancelButtonText=\u53D6\u6D88
 FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=\u5132\u5b58
+FileChooser.saveButtonText=\u78BA\u5B9A
 FileChooser.saveButtonMnemonic=79
-FileChooser.openButtonText=\u78ba\u5b9a
+FileChooser.openButtonText=\u78BA\u5B9A
 FileChooser.openButtonMnemonic=79
-FileChooser.saveDialogTitleText=\u5132\u5b58
-FileChooser.openDialogTitleText=\u958b\u555f
-FileChooser.pathLabelText=\u9078\u53d6:
-FileChooser.filterLabelText=\u904e\u6ffe\u5668:
+FileChooser.saveDialogTitleText=\u5132\u5B58
+FileChooser.openDialogTitleText=\u958B\u555F
+FileChooser.pathLabelText=\u9078\u53D6:
+FileChooser.filterLabelText=\u7BE9\u9078:
 FileChooser.pathLabelMnemonic=83
-FileChooser.foldersLabelText=\u6a94\u6848\u593e
+FileChooser.foldersLabelText=\u8CC7\u6599\u593E
 FileChooser.foldersLabelMnemonic=68
-FileChooser.filesLabelText=\u6a94\u6848
+FileChooser.filesLabelText=\u6A94\u6848
 FileChooser.filesLabelMnemonic=70
 
-FileChooser.cancelButtonToolTipText=\u4e2d\u65b7\u6a94\u6848\u9078\u64c7\u7a0b\u5f0f\u5c0d\u8a71\u65b9\u584a\u3002
-FileChooser.saveButtonToolTipText=\u5132\u5b58\u9078\u53d6\u7684\u6a94\u6848\u3002
-FileChooser.openButtonToolTipText=\u958b\u555f\u9078\u53d6\u7684\u6a94\u6848\u3002
+FileChooser.cancelButtonToolTipText=\u4E2D\u6B62\u6A94\u6848\u9078\u64C7\u5668\u5C0D\u8A71\u65B9\u584A\u3002
+FileChooser.saveButtonToolTipText=\u5132\u5B58\u9078\u53D6\u7684\u6A94\u6848\u3002
+FileChooser.openButtonToolTipText=\u958B\u555F\u9078\u53D6\u7684\u6A94\u6848\u3002
 
-FileChooser.renameFileDialogText=\u5c07\u6a94\u6848 "{0}" \u91cd\u65b0\u547d\u540d\u70ba
-FileChooser.renameFileErrorTitle=\u932f\u8aa4 
-FileChooser.renameFileErrorText=\u5c07\u6a94\u6848 "{0}" \u91cd\u65b0\u547d\u540d\u70ba "{1}" \u6642\u51fa\u73fe\u932f\u8aa4
+FileChooser.renameFileDialogText=\u5C07\u6A94\u6848 "{0}" \u91CD\u65B0\u547D\u540D\u70BA
+FileChooser.renameFileErrorTitle=\u932F\u8AA4 
+FileChooser.renameFileErrorText=\u5C07\u6A94\u6848 "{0}" \u91CD\u65B0\u547D\u540D\u70BA "{1}" \u6642\u51FA\u73FE\u932F\u8AA4
 
 OptionPane.okButtonMnemonic=79
 OptionPane.cancelButtonMnemonic=67
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -23,18 +23,18 @@
 FileChooser.saveButtonText=Speichern
 FileChooser.openButtonText=OK
 FileChooser.saveDialogTitleText=Speichern
-FileChooser.openDialogTitleText=\u00d6ffnen
+FileChooser.openDialogTitleText=\u00D6ffnen
 FileChooser.updateButtonText=Aktualisieren
 FileChooser.helpButtonText=Hilfe
 FileChooser.pathLabelText=Pfad- oder Ordnernamen eingeben:
 FileChooser.filterLabelText=Filter
 FileChooser.foldersLabelText=Ordner
 FileChooser.filesLabelText=Dateien
-FileChooser.enterFileNameLabelText=Filternamen eingeben:
-FileChooser.enterFolderNameLabelText=Enter folder name:
+FileChooser.enterFileNameLabelText=Dateinamen eingeben:
+FileChooser.enterFolderNameLabelText=Ordnernamen eingeben:
 
-FileChooser.cancelButtonToolTipText=Dialogfeld f\u00fcr Dateiauswahl abbrechen
-FileChooser.saveButtonToolTipText=Ausgew\u00e4hlte Datei speichern
-FileChooser.openButtonToolTipText=Ausgew\u00e4hlte Datei \u00f6ffnen
-FileChooser.updateButtonToolTipText=Verzeichnisliste aktualisieren
-FileChooser.helpButtonToolTipText=Hilfe f\u00fcr Dateiauswahl
+FileChooser.cancelButtonToolTipText=Dialogfeld f\u00FCr Dateiauswahl schlie\u00DFen.
+FileChooser.saveButtonToolTipText=Ausgew\u00E4hlte Datei speichern.
+FileChooser.openButtonToolTipText=Ausgew\u00E4hlte Datei \u00F6ffnen.
+FileChooser.updateButtonToolTipText=Verzeichnisliste aktualisieren.
+FileChooser.helpButtonToolTipText=FileChooser-Hilfe.
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -26,15 +26,15 @@
 FileChooser.openDialogTitleText=Abrir
 FileChooser.updateButtonText=Actualizar
 FileChooser.helpButtonText=Ayuda
-FileChooser.pathLabelText=Introducir v\u00eda de acceso o nombre de carpeta:
+FileChooser.pathLabelText=Introducir nombre de la ruta de acceso o carpeta:
 FileChooser.filterLabelText=Filtro
 FileChooser.foldersLabelText=Carpetas
 FileChooser.filesLabelText=Archivos
 FileChooser.enterFileNameLabelText=Introducir nombre de archivo:
-FileChooser.enterFolderNameLabelText=Enter folder name:
+FileChooser.enterFolderNameLabelText=Introducir nombre de carpeta:
 
-FileChooser.cancelButtonToolTipText=Cuadro de di\u00e1logo para cancelar elector de archivo.
+FileChooser.cancelButtonToolTipText=Abortar cuadro de di\u00E1logo del selector de archivos.
 FileChooser.saveButtonToolTipText=Guardar archivo seleccionado.
 FileChooser.openButtonToolTipText=Abrir archivo seleccionado.
 FileChooser.updateButtonToolTipText=Actualizar lista de directorios.
-FileChooser.helpButtonToolTipText=Ayuda elector de archivos.
+FileChooser.helpButtonToolTipText=Ayuda del selector de archivos.
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -24,17 +24,17 @@
 FileChooser.openButtonText=OK
 FileChooser.saveDialogTitleText=Enregistrer
 FileChooser.openDialogTitleText=Ouvrir
-FileChooser.updateButtonText=Mise \u00e0 jour
+FileChooser.updateButtonText=Mettre \u00E0 jour
 FileChooser.helpButtonText=Aide
 FileChooser.pathLabelText=Entrez le chemin ou le nom du dossier :
 FileChooser.filterLabelText=Filtre
 FileChooser.foldersLabelText=Dossiers
 FileChooser.filesLabelText=Fichiers
 FileChooser.enterFileNameLabelText=Entrez le nom du fichier :
-FileChooser.enterFolderNameLabelText=Enter folder name:
+FileChooser.enterFolderNameLabelText=Entrez le nom du dossier :
 
-FileChooser.cancelButtonToolTipText=Ferme la bo\u00eete de dialogue du s\u00e9lecteur de fichiers
-FileChooser.saveButtonToolTipText=Enregistre le fichier s\u00e9lectionn\u00e9
-FileChooser.openButtonToolTipText=Ouvre le fichier s\u00e9lectionn\u00e9
-FileChooser.updateButtonToolTipText=Met \u00e0 jour la liste des r\u00e9pertoires
-FileChooser.helpButtonToolTipText=Aide sur le s\u00e9lecteur de fichiers
+FileChooser.cancelButtonToolTipText=Ferme la bo\u00EEte de dialogue du s\u00E9lecteur de fichiers.
+FileChooser.saveButtonToolTipText=Enregistre le fichier s\u00E9lectionn\u00E9.
+FileChooser.openButtonToolTipText=Ouvre le fichier s\u00E9lectionn\u00E9.
+FileChooser.updateButtonToolTipText=Met \u00E0 jour la liste des r\u00E9pertoires.
+FileChooser.helpButtonToolTipText=Aide du s\u00E9lecteur de fichiers
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -31,10 +31,10 @@
 FileChooser.foldersLabelText=Cartelle
 FileChooser.filesLabelText=File
 FileChooser.enterFileNameLabelText=Nome file:
-FileChooser.enterFolderNameLabelText=Enter folder name:
+FileChooser.enterFolderNameLabelText=Nome cartella:
 
-FileChooser.cancelButtonToolTipText=Finestra di dialogo Interrompi Selezione file.
-FileChooser.saveButtonToolTipText=Salva file selezionato.
-FileChooser.openButtonToolTipText=Apri file selezionato.
-FileChooser.updateButtonToolTipText=Aggiorna elenco directory.
-FileChooser.helpButtonToolTipText=Guida di Selezione file.
+FileChooser.cancelButtonToolTipText=Chiude la finestra di dialogo di selezione file.
+FileChooser.saveButtonToolTipText=Salva il file selezionato.
+FileChooser.openButtonToolTipText=Apre il file selezionato.
+FileChooser.updateButtonToolTipText=Aggiorna lista directory.
+FileChooser.helpButtonToolTipText=Guida FileChooser.
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -19,22 +19,22 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.acceptAllFileFilterText=*
-FileChooser.cancelButtonText=\u53d6\u6d88\u3057
-FileChooser.saveButtonText=\u4fdd\u5b58
-FileChooser.openButtonText=\u4e86\u89e3
-FileChooser.saveDialogTitleText=\u4fdd\u5b58
-FileChooser.openDialogTitleText=\u958b\u304f
-FileChooser.updateButtonText=\u66f4\u65b0
-FileChooser.helpButtonText=\u30d8\u30eb\u30d7
-FileChooser.pathLabelText=\u30d1\u30b9\u307e\u305f\u306f\u30d5\u30a9\u30eb\u30c0\u540d\u3092\u5165\u529b:
-FileChooser.filterLabelText=\u30d5\u30a3\u30eb\u30bf
-FileChooser.foldersLabelText=\u30d5\u30a9\u30eb\u30c0
-FileChooser.filesLabelText=\u30d5\u30a1\u30a4\u30eb
-FileChooser.enterFileNameLabelText=\u30d5\u30a1\u30a4\u30eb\u540d\u3092\u5165\u529b:
-FileChooser.enterFolderNameLabelText=Enter folder name:
+FileChooser.cancelButtonText=\u53D6\u6D88
+FileChooser.saveButtonText=\u4FDD\u5B58
+FileChooser.openButtonText=OK
+FileChooser.saveDialogTitleText=\u4FDD\u5B58
+FileChooser.openDialogTitleText=\u958B\u304F
+FileChooser.updateButtonText=\u66F4\u65B0
+FileChooser.helpButtonText=\u30D8\u30EB\u30D7
+FileChooser.pathLabelText=\u30D1\u30B9\u307E\u305F\u306F\u30D5\u30A9\u30EB\u30C0\u540D\u3092\u5165\u529B:
+FileChooser.filterLabelText=\u30D5\u30A3\u30EB\u30BF
+FileChooser.foldersLabelText=\u30D5\u30A9\u30EB\u30C0
+FileChooser.filesLabelText=\u30D5\u30A1\u30A4\u30EB
+FileChooser.enterFileNameLabelText=\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u5165\u529B:
+FileChooser.enterFolderNameLabelText=\u30D5\u30A9\u30EB\u30C0\u540D\u3092\u5165\u529B:
 
-FileChooser.cancelButtonToolTipText=\u30d5\u30a1\u30a4\u30eb\u30c1\u30e5\u30fc\u30b6\u30c0\u30a4\u30a2\u30ed\u30b0\u3092\u7d42\u4e86
-FileChooser.saveButtonToolTipText=\u9078\u629e\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u306b\u4fdd\u5b58
-FileChooser.openButtonToolTipText=\u9078\u629e\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u958b\u304f
-FileChooser.updateButtonToolTipText=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u8868\u793a\u3092\u66f4\u65b0
-FileChooser.helpButtonToolTipText=\u30d5\u30a1\u30a4\u30eb\u30c1\u30e5\u30fc\u30b6\u306e\u30d8\u30eb\u30d7
+FileChooser.cancelButtonToolTipText=\u30D5\u30A1\u30A4\u30EB\u30FB\u30C1\u30E5\u30FC\u30B6\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u7D42\u4E86\u3057\u307E\u3059\u3002
+FileChooser.saveButtonToolTipText=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3057\u307E\u3059\u3002
+FileChooser.openButtonToolTipText=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304D\u307E\u3059\u3002
+FileChooser.updateButtonToolTipText=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30EA\u30B9\u30C8\u3092\u66F4\u65B0\u3057\u307E\u3059\u3002
+FileChooser.helpButtonToolTipText=FileChooser\u306E\u30D8\u30EB\u30D7\u3067\u3059\u3002
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -19,22 +19,22 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.acceptAllFileFilterText=*
-FileChooser.cancelButtonText=\ucde8\uc18c
-FileChooser.saveButtonText=\uc800\uc7a5
-FileChooser.openButtonText=\ud655\uc778
-FileChooser.saveDialogTitleText=\uc800\uc7a5
-FileChooser.openDialogTitleText=\uc5f4\uae30
-FileChooser.updateButtonText=\uc5c5\ub370\uc774\ud2b8
-FileChooser.helpButtonText=\ub3c4\uc6c0\ub9d0
-FileChooser.pathLabelText=\uacbd\ub85c \ub610\ub294 \ud3f4\ub354 \uc774\ub984\uc744 \uc785\ub825\ud558\uc2ed\uc2dc\uc624:
-FileChooser.filterLabelText=\ud544\ud130
-FileChooser.foldersLabelText=\ud3f4\ub354
-FileChooser.filesLabelText=\ud30c\uc77c
-FileChooser.enterFileNameLabelText=\ud30c\uc77c \uc774\ub984\uc744 \uc785\ub825\ud558\uc2ed\uc2dc\uc624:
-FileChooser.enterFolderNameLabelText=Enter folder name:
+FileChooser.cancelButtonText=\uCDE8\uC18C
+FileChooser.saveButtonText=\uC800\uC7A5
+FileChooser.openButtonText=\uD655\uC778
+FileChooser.saveDialogTitleText=\uC800\uC7A5
+FileChooser.openDialogTitleText=\uC5F4\uAE30
+FileChooser.updateButtonText=\uAC31\uC2E0
+FileChooser.helpButtonText=\uB3C4\uC6C0\uB9D0
+FileChooser.pathLabelText=\uACBD\uB85C \uB610\uB294 \uD3F4\uB354 \uC774\uB984 \uC785\uB825:
+FileChooser.filterLabelText=\uD544\uD130
+FileChooser.foldersLabelText=\uD3F4\uB354
+FileChooser.filesLabelText=\uD30C\uC77C
+FileChooser.enterFileNameLabelText=\uD30C\uC77C \uC774\uB984 \uC785\uB825:
+FileChooser.enterFolderNameLabelText=\uD3F4\uB354 \uC774\uB984 \uC785\uB825:
 
-FileChooser.cancelButtonToolTipText=\ud30c\uc77c \uc120\ud0dd \ub300\ud654\uc0c1\uc790\ub97c \uc911\uc9c0\ud569\ub2c8\ub2e4.
-FileChooser.saveButtonToolTipText=\uc120\ud0dd\ub41c \ud30c\uc77c\uc744 \uc800\uc7a5\ud569\ub2c8\ub2e4.
-FileChooser.openButtonToolTipText=\uc120\ud0dd\ub41c \ud30c\uc77c\uc744 \uc5fd\ub2c8\ub2e4.
-FileChooser.updateButtonToolTipText=\ub514\ub809\ud1a0\ub9ac \ubaa9\ub85d\uc744 \uc5c5\ub370\uc774\ud2b8\ud569\ub2c8\ub2e4.
-FileChooser.helpButtonToolTipText=FileChooser \ub3c4\uc6c0\ub9d0.
+FileChooser.cancelButtonToolTipText=\uD30C\uC77C \uC120\uD0DD\uAE30 \uB300\uD654\uC0C1\uC790\uB97C \uC911\uB2E8\uD569\uB2C8\uB2E4.
+FileChooser.saveButtonToolTipText=\uC120\uD0DD\uB41C \uD30C\uC77C\uC744 \uC800\uC7A5\uD569\uB2C8\uB2E4.
+FileChooser.openButtonToolTipText=\uC120\uD0DD\uB41C \uD30C\uC77C\uC744 \uC5FD\uB2C8\uB2E4.
+FileChooser.updateButtonToolTipText=\uB514\uB809\uD1A0\uB9AC \uBAA9\uB85D\uC744 \uAC31\uC2E0\uD569\uB2C8\uB2E4.
+FileChooser.helpButtonToolTipText=FileChooser \uB3C4\uC6C0\uB9D0\uC785\uB2C8\uB2E4.
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -26,14 +26,15 @@
 FileChooser.openDialogTitleText=Abrir
 FileChooser.updateButtonText=Atualizar
 FileChooser.helpButtonText=Ajuda
-FileChooser.pathLabelText=Inserir caminho ou nome da pasta:
+FileChooser.pathLabelText=Informar caminho ou nome da pasta:
 FileChooser.filterLabelText=Filtro
 FileChooser.foldersLabelText=Pastas
 FileChooser.filesLabelText=Arquivos
-FileChooser.enterFileNameLabelText=Inserir nome de arquivo:
+FileChooser.enterFileNameLabelText=Informar nome do arquivo:
+FileChooser.enterFolderNameLabelText=Informar nome da pasta:
 
-FileChooser.cancelButtonToolTipText=Anular caixa de di\u00e1logo do seletor de arquivos.
+FileChooser.cancelButtonToolTipText=Abortar caixa de di\u00E1logo do seletor de arquivos.
 FileChooser.saveButtonToolTipText=Salvar arquivo selecionado.
 FileChooser.openButtonToolTipText=Abrir arquivo selecionado.
-FileChooser.updateButtonToolTipText=Atualizar lista de diret\u00f3rios.
+FileChooser.updateButtonToolTipText=Atualizar lista de diret\u00F3rios.
 FileChooser.helpButtonToolTipText=Ajuda do FileChooser.
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -23,18 +23,18 @@
 FileChooser.saveButtonText=Spara
 FileChooser.openButtonText=OK
 FileChooser.saveDialogTitleText=Spara
-FileChooser.openDialogTitleText=\u00d6ppna
+FileChooser.openDialogTitleText=\u00D6ppna
 FileChooser.updateButtonText=Uppdatera
-FileChooser.helpButtonText=Hj\u00e4lp
-FileChooser.pathLabelText=Ange s\u00f6kv\u00e4g eller mappnamn:
+FileChooser.helpButtonText=Hj\u00E4lp
+FileChooser.pathLabelText=Ange s\u00F6kv\u00E4g eller mappnamn:
 FileChooser.filterLabelText=Filter
 FileChooser.foldersLabelText=Mappar
 FileChooser.filesLabelText=Filer
 FileChooser.enterFileNameLabelText=Ange filnamn:
-FileChooser.enterFolderNameLabelText=Enter folder name:
+FileChooser.enterFolderNameLabelText=Ange ett mappnamn:
 
-FileChooser.cancelButtonToolTipText=Avbryt \u00d6ppna fil.
-FileChooser.saveButtonToolTipText=Spara markerad fil.
-FileChooser.openButtonToolTipText=\u00d6ppna markerad fil.
+FileChooser.cancelButtonToolTipText=Avbryt dialogrutan Filv\u00E4ljare.
+FileChooser.saveButtonToolTipText=Spara vald fil.
+FileChooser.openButtonToolTipText=\u00D6ppna vald fil.
 FileChooser.updateButtonToolTipText=Uppdatera kataloglistan.
-FileChooser.helpButtonToolTipText=Hj\u00e4lp - Filv\u00e4ljare.
+FileChooser.helpButtonToolTipText=Hj\u00E4lp - Filv\u00E4ljare.
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -19,22 +19,22 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.acceptAllFileFilterText=*
-FileChooser.cancelButtonText=\u53d6\u6d88
-FileChooser.saveButtonText=\u4fdd\u5b58
-FileChooser.openButtonText=\u786e\u5b9a
-FileChooser.saveDialogTitleText=\u4fdd\u5b58
-FileChooser.openDialogTitleText=\u6253\u5f00
-FileChooser.updateButtonText=\u66f4\u65b0
-FileChooser.helpButtonText=\u5e2e\u52a9
-FileChooser.pathLabelText=\u952e\u5165\u8def\u5f84\u6216\u6587\u4ef6\u5939\u540d\uff1a
-FileChooser.filterLabelText=\u8fc7\u6ee4\u5668
-FileChooser.foldersLabelText=\u6587\u4ef6\u5939
-FileChooser.filesLabelText=\u6587\u4ef6
-FileChooser.enterFileNameLabelText=\u952e\u5165\u6587\u4ef6\u540d\uff1a
-FileChooser.enterFolderNameLabelText=Enter folder name:
+FileChooser.cancelButtonText=\u53D6\u6D88
+FileChooser.saveButtonText=\u4FDD\u5B58
+FileChooser.openButtonText=\u786E\u5B9A
+FileChooser.saveDialogTitleText=\u4FDD\u5B58
+FileChooser.openDialogTitleText=\u6253\u5F00
+FileChooser.updateButtonText=\u66F4\u65B0
+FileChooser.helpButtonText=\u5E2E\u52A9
+FileChooser.pathLabelText=\u952E\u5165\u8DEF\u5F84\u6216\u6587\u4EF6\u5939\u540D: 
+FileChooser.filterLabelText=\u7B5B\u9009\u5668
+FileChooser.foldersLabelText=\u6587\u4EF6\u5939
+FileChooser.filesLabelText=\u6587\u4EF6
+FileChooser.enterFileNameLabelText=\u952E\u5165\u6587\u4EF6\u540D: 
+FileChooser.enterFolderNameLabelText=\u8F93\u5165\u6587\u4EF6\u5939\u540D:
 
-FileChooser.cancelButtonToolTipText=\u7ec8\u6b62\u6587\u4ef6\u9009\u62e9\u5668\u5bf9\u8bdd\u6846
-FileChooser.saveButtonToolTipText=\u4fdd\u5b58\u9009\u62e9\u7684\u6587\u4ef6
-FileChooser.openButtonToolTipText=\u6253\u5f00\u9009\u62e9\u7684\u6587\u4ef6
-FileChooser.updateButtonToolTipText=\u66f4\u65b0\u76ee\u5f55\u5217\u8868
-FileChooser.helpButtonToolTipText=\u6587\u4ef6\u9009\u62e9\u5668\u5e2e\u52a9
+FileChooser.cancelButtonToolTipText=\u4E2D\u6B62\u6587\u4EF6\u9009\u62E9\u5668\u5BF9\u8BDD\u6846\u3002
+FileChooser.saveButtonToolTipText=\u4FDD\u5B58\u6240\u9009\u6587\u4EF6\u3002
+FileChooser.openButtonToolTipText=\u6253\u5F00\u6240\u9009\u6587\u4EF6\u3002
+FileChooser.updateButtonToolTipText=\u66F4\u65B0\u76EE\u5F55\u5217\u8868\u3002
+FileChooser.helpButtonToolTipText=FileChooser \u5E2E\u52A9\u3002
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -19,22 +19,22 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.acceptAllFileFilterText=*
-FileChooser.cancelButtonText=\u53d6\u6d88
-FileChooser.saveButtonText=\u5132\u5b58
-FileChooser.openButtonText=\u78ba\u5b9a
-FileChooser.saveDialogTitleText=\u5132\u5b58
-FileChooser.openDialogTitleText=\u958b\u555f
-FileChooser.updateButtonText=\u66f4\u65b0
-FileChooser.helpButtonText=\u8aaa\u660e
-FileChooser.pathLabelText=\u8f38\u5165\u8def\u5f91\u6216\u6a94\u6848\u593e\u540d\u7a31\ufe55
-FileChooser.filterLabelText=\u904e\u6ffe\u5668
-FileChooser.foldersLabelText=\u6a94\u6848\u593e
-FileChooser.filesLabelText=\u6a94\u6848
-FileChooser.enterFileNameLabelText=\u8f38\u5165\u6a94\u6848\u540d\u7a31\ufe55
-FileChooser.enterFolderNameLabelText=Enter folder name:
+FileChooser.cancelButtonText=\u53D6\u6D88
+FileChooser.saveButtonText=\u5132\u5B58
+FileChooser.openButtonText=\u78BA\u5B9A
+FileChooser.saveDialogTitleText=\u5132\u5B58
+FileChooser.openDialogTitleText=\u958B\u555F
+FileChooser.updateButtonText=\u66F4\u65B0
+FileChooser.helpButtonText=\u8AAA\u660E
+FileChooser.pathLabelText=\u8F38\u5165\u8DEF\u5F91\u6216\u8CC7\u6599\u593E\u540D\u7A31:
+FileChooser.filterLabelText=\u7BE9\u9078
+FileChooser.foldersLabelText=\u8CC7\u6599\u593E
+FileChooser.filesLabelText=\u6A94\u6848
+FileChooser.enterFileNameLabelText=\u8F38\u5165\u6A94\u6848\u540D\u7A31:
+FileChooser.enterFolderNameLabelText=\u8F38\u5165\u8CC7\u6599\u593E\u540D\u7A31:
 
-FileChooser.cancelButtonToolTipText=\u4e2d\u65b7\u300c\u6a94\u6848\u9078\u64c7\u5668\u300d\u5c0d\u8a71\u65b9\u584a\u3002
-FileChooser.saveButtonToolTipText=\u5132\u5b58\u9078\u53d6\u7684\u6a94\u6848\u3002
-FileChooser.openButtonToolTipText=\u958b\u555f\u9078\u53d6\u7684\u6a94\u6848\u3002
-FileChooser.updateButtonToolTipText=\u66f4\u65b0\u76ee\u9304\u6e05\u55ae\u3002
-FileChooser.helpButtonToolTipText=\u300c\u6a94\u6848\u9078\u64c7\u5668\u300d\u8aaa\u660e\u3002
+FileChooser.cancelButtonToolTipText=\u4E2D\u6B62\u6A94\u6848\u9078\u64C7\u5668\u5C0D\u8A71\u65B9\u584A\u3002
+FileChooser.saveButtonToolTipText=\u5132\u5B58\u9078\u53D6\u7684\u6A94\u6848\u3002
+FileChooser.openButtonToolTipText=\u958B\u555F\u9078\u53D6\u7684\u6A94\u6848\u3002
+FileChooser.updateButtonToolTipText=\u66F4\u65B0\u76EE\u9304\u6E05\u55AE\u3002
+FileChooser.helpButtonToolTipText=\u300C\u6A94\u6848\u9078\u64C7\u5668\u300D\u8AAA\u660E\u3002
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -21,10 +21,10 @@
 FileChooser.lookInLabelText=Suchen in:
 FileChooser.saveInLabelText=Speichern in:
 FileChooser.fileNameLabelText=Dateiname:
-FileChooser.folderNameLabelText=Folder name:
+FileChooser.folderNameLabelText=Ordnername:
 FileChooser.filesOfTypeLabelText=Dateityp:
-FileChooser.upFolderToolTipText=Eine Ebene h\u00f6her
-FileChooser.upFolderAccessibleName=H\u00f6her
+FileChooser.upFolderToolTipText=Eine Ebene h\u00F6her
+FileChooser.upFolderAccessibleName=Nach oben
 FileChooser.homeFolderToolTipText=Home
 FileChooser.homeFolderAccessibleName=Home
 FileChooser.newFolderToolTipText=Neuen Ordner erstellen
@@ -35,13 +35,13 @@
 FileChooser.listViewActionLabelText=Liste
 FileChooser.detailsViewButtonToolTipText=Details
 FileChooser.detailsViewButtonAccessibleName=Details
-FileChooser.viewMenuButtonToolTipText = View Menu
-FileChooser.viewMenuButtonAccessibleName = View Menu
+FileChooser.viewMenuButtonToolTipText = Ansichtsmen\u00FC
+FileChooser.viewMenuButtonAccessibleName = Ansichtsmen\u00FC
 FileChooser.detailsViewActionLabelText=Details
 FileChooser.refreshActionLabelText=Aktualisieren
 FileChooser.viewMenuLabelText=Ansicht
-FileChooser.fileNameHeaderText=Dateiname
-FileChooser.fileSizeHeaderText=Gr\u00f6\u00dfe
+FileChooser.fileNameHeaderText=Name
+FileChooser.fileSizeHeaderText=Gr\u00F6\u00DFe
 FileChooser.fileTypeHeaderText=Typ
-FileChooser.fileDateHeaderText=Ge\u00e4ndert
-FileChooser.fileAttrHeaderText=Attribut
+FileChooser.fileDateHeaderText=Ge\u00E4ndert
+FileChooser.fileAttrHeaderText=Attribute
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -20,28 +20,28 @@
 
 FileChooser.lookInLabelText=Buscar en:
 FileChooser.saveInLabelText=Guardar en:
-FileChooser.fileNameLabelText=Nombre de archivo:
-FileChooser.folderNameLabelText=Folder name:
-FileChooser.filesOfTypeLabelText=Archivos de tipo:
-FileChooser.upFolderToolTipText=Subir un nivel
+FileChooser.fileNameLabelText=Nombre de Archivo:
+FileChooser.folderNameLabelText=Nombre de la Carpeta:
+FileChooser.filesOfTypeLabelText=Archivos de Tipo:
+FileChooser.upFolderToolTipText=Subir un Nivel
 FileChooser.upFolderAccessibleName=Arriba
-FileChooser.homeFolderToolTipText=Principal
-FileChooser.homeFolderAccessibleName=Principal
-FileChooser.newFolderToolTipText=Crear carpeta nueva
-FileChooser.newFolderAccessibleName=Carpeta nueva
-FileChooser.newFolderActionLabelText=Carpeta nueva
+FileChooser.homeFolderToolTipText=Inicio
+FileChooser.homeFolderAccessibleName=Inicio
+FileChooser.newFolderToolTipText=Crear Nueva Carpeta
+FileChooser.newFolderAccessibleName=Nueva Carpeta
+FileChooser.newFolderActionLabelText=Nueva Carpeta
 FileChooser.listViewButtonToolTipText=Lista
 FileChooser.listViewButtonAccessibleName=Lista
 FileChooser.listViewActionLabelText=Lista
 FileChooser.detailsViewButtonToolTipText=Detalles
 FileChooser.detailsViewButtonAccessibleName=Detalles
-FileChooser.viewMenuButtonToolTipText = View Menu
-FileChooser.viewMenuButtonAccessibleName = View Menu
+FileChooser.viewMenuButtonToolTipText = Men\u00FA Ver
+FileChooser.viewMenuButtonAccessibleName = Men\u00FA Ver
 FileChooser.detailsViewActionLabelText=Detalles
-FileChooser.refreshActionLabelText=Renovar
+FileChooser.refreshActionLabelText=Refrescar
 FileChooser.viewMenuLabelText=Ver
 FileChooser.fileNameHeaderText=Nombre
-FileChooser.fileSizeHeaderText=Tama\u00f1o
+FileChooser.fileSizeHeaderText=Tama\u00F1o
 FileChooser.fileTypeHeaderText=Tipo
 FileChooser.fileDateHeaderText=Modificado
 FileChooser.fileAttrHeaderText=Atributos
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -20,28 +20,28 @@
 
 FileChooser.lookInLabelText=Rechercher dans :
 FileChooser.saveInLabelText=Enregistrer dans :
-FileChooser.fileNameLabelText=Nom de fichier :
-FileChooser.folderNameLabelText=Folder name:
-FileChooser.filesOfTypeLabelText=Fichiers du type :
+FileChooser.fileNameLabelText=Nom du fichier :
+FileChooser.folderNameLabelText=Nom du dossier :
+FileChooser.filesOfTypeLabelText=Fichiers de type :
 FileChooser.upFolderToolTipText=Remonte d'un niveau.
-FileChooser.upFolderAccessibleName=Vers le haut
-FileChooser.homeFolderToolTipText=R\u00e9pertoire d'accueil
-FileChooser.homeFolderAccessibleName=Accueil
-FileChooser.newFolderToolTipText=Cr\u00e9e un nouveau dossier.
+FileChooser.upFolderAccessibleName=Monter
+FileChooser.homeFolderToolTipText=R\u00E9pertoire d'origine
+FileChooser.homeFolderAccessibleName=R\u00E9pertoire d'origine
+FileChooser.newFolderToolTipText=Cr\u00E9e un dossier.
 FileChooser.newFolderAccessibleName=Nouveau dossier
 FileChooser.newFolderActionLabelText=Nouveau dossier
 FileChooser.listViewButtonToolTipText=Liste
 FileChooser.listViewButtonAccessibleName=Liste
 FileChooser.listViewActionLabelText=Liste
-FileChooser.detailsViewButtonToolTipText=D\u00e9tails
-FileChooser.detailsViewButtonAccessibleName=D\u00e9tails
-FileChooser.viewMenuButtonToolTipText = View Menu
-FileChooser.viewMenuButtonAccessibleName = View Menu
-FileChooser.detailsViewActionLabelText=D\u00e9tails
+FileChooser.detailsViewButtonToolTipText=D\u00E9tails
+FileChooser.detailsViewButtonAccessibleName=D\u00E9tails
+FileChooser.viewMenuButtonToolTipText = Menu Affichage
+FileChooser.viewMenuButtonAccessibleName = Menu Affichage
+FileChooser.detailsViewActionLabelText=D\u00E9tails
 FileChooser.refreshActionLabelText=Actualiser
 FileChooser.viewMenuLabelText=Affichage
 FileChooser.fileNameHeaderText=Nom
 FileChooser.fileSizeHeaderText=Taille
 FileChooser.fileTypeHeaderText=Type
-FileChooser.fileDateHeaderText=Modifi\u00e9
+FileChooser.fileDateHeaderText=Modifi\u00E9
 FileChooser.fileAttrHeaderText=Attributs
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -21,22 +21,22 @@
 FileChooser.lookInLabelText=Cerca in:
 FileChooser.saveInLabelText=Salva in:
 FileChooser.fileNameLabelText=Nome file:
-FileChooser.folderNameLabelText=Folder name:
+FileChooser.folderNameLabelText=Nome della cartella:
 FileChooser.filesOfTypeLabelText=Tipo file:
 FileChooser.upFolderToolTipText=Cartella superiore
 FileChooser.upFolderAccessibleName=Superiore
-FileChooser.homeFolderToolTipText=Principale
-FileChooser.homeFolderAccessibleName=Principale
+FileChooser.homeFolderToolTipText=Home
+FileChooser.homeFolderAccessibleName=Home
 FileChooser.newFolderToolTipText=Crea nuova cartella
 FileChooser.newFolderAccessibleName=Nuova cartella
 FileChooser.newFolderActionLabelText=Nuova cartella
-FileChooser.listViewButtonToolTipText=Elenco
-FileChooser.listViewButtonAccessibleName=Elenco
-FileChooser.listViewActionLabelText=Elenco
+FileChooser.listViewButtonToolTipText=Lista
+FileChooser.listViewButtonAccessibleName=Lista
+FileChooser.listViewActionLabelText=Lista
 FileChooser.detailsViewButtonToolTipText=Dettagli
 FileChooser.detailsViewButtonAccessibleName=Dettagli
-FileChooser.viewMenuButtonToolTipText = View Menu
-FileChooser.viewMenuButtonAccessibleName = View Menu
+FileChooser.viewMenuButtonToolTipText = Visualizza menu
+FileChooser.viewMenuButtonAccessibleName = Visualizza menu
 FileChooser.detailsViewActionLabelText=Dettagli
 FileChooser.refreshActionLabelText=Aggiorna
 FileChooser.viewMenuLabelText=Visualizza
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -18,33 +18,30 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=\u53c2\u7167:
-FileChooser.saveInLabelText=\u4fdd\u5b58:
-FileChooser.fileNameLabelText=\u30d5\u30a1\u30a4\u30eb\u540d:
-FileChooser.folderNameLabelText=Folder name:
-FileChooser.filesOfTypeLabelText=\u30d5\u30a1\u30a4\u30eb\u30bf\u30a4\u30d7:
-FileChooser.upFolderToolTipText=1 \u30ec\u30d9\u30eb\u4e0a\u3078
-FileChooser.upFolderAccessibleName=\u4e0a\u3078
-FileChooser.homeFolderToolTipText=\u30db\u30fc\u30e0
-FileChooser.homeFolderAccessibleName=\u30db\u30fc\u30e0
-FileChooser.newFolderToolTipText=\u30d5\u30a9\u30eb\u30c0\u306e\u65b0\u898f\u4f5c\u6210
-FileChooser.newFolderAccessibleName=\u65b0\u898f\u30d5\u30a9\u30eb\u30c0
-FileChooser.newFolderActionLabelText=\u65b0\u898f\u30d5\u30a9\u30eb\u30c0
-FileChooser.listViewButtonToolTipText=\u30ea\u30b9\u30c8
-FileChooser.listViewButtonAccessibleName=\u30ea\u30b9\u30c8
-FileChooser.listViewActionLabelText=\u30ea\u30b9\u30c8
-FileChooser.detailsViewButtonToolTipText=\u8a73\u7d30
-FileChooser.detailsViewButtonAccessibleName=\u8a73\u7d30
-FileChooser.viewMenuButtonToolTipText = View Menu
-FileChooser.viewMenuButtonAccessibleName = View Menu
-FileChooser.detailsViewActionLabelText=\u8a73\u7d30
-FileChooser.refreshActionLabelText=\u66f4\u65b0
-FileChooser.viewMenuLabelText=\u8868\u793a
-FileChooser.fileNameHeaderText=\u540d\u524d
-FileChooser.fileSizeHeaderText=\u30b5\u30a4\u30ba
-FileChooser.fileTypeHeaderText=\u30bf\u30a4\u30d7
-FileChooser.fileDateHeaderText=\u66f4\u65b0\u65e5
-FileChooser.fileAttrHeaderText=\u5c5e\u6027
-FileChooser.directoryOpenButtonText=\u958b\u304f(O)
-FileChooser.openButtonText=\u958b\u304f(O)
-FileChooser.saveButtonText=\u4fdd\u5b58(S)
+FileChooser.lookInLabelText=\u53C2\u7167:
+FileChooser.saveInLabelText=\u4FDD\u5B58:
+FileChooser.fileNameLabelText=\u30D5\u30A1\u30A4\u30EB\u540D:
+FileChooser.folderNameLabelText=\u30D5\u30A9\u30EB\u30C0\u540D:
+FileChooser.filesOfTypeLabelText=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7:
+FileChooser.upFolderToolTipText=1\u30EC\u30D9\u30EB\u4E0A\u3078
+FileChooser.upFolderAccessibleName=\u4E0A\u3078
+FileChooser.homeFolderToolTipText=\u30DB\u30FC\u30E0
+FileChooser.homeFolderAccessibleName=\u30DB\u30FC\u30E0
+FileChooser.newFolderToolTipText=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210
+FileChooser.newFolderAccessibleName=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
+FileChooser.newFolderActionLabelText=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
+FileChooser.listViewButtonToolTipText=\u30EA\u30B9\u30C8
+FileChooser.listViewButtonAccessibleName=\u30EA\u30B9\u30C8
+FileChooser.listViewActionLabelText=\u30EA\u30B9\u30C8
+FileChooser.detailsViewButtonToolTipText=\u8A73\u7D30
+FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30
+FileChooser.viewMenuButtonToolTipText = \u8868\u793A\u30E1\u30CB\u30E5\u30FC
+FileChooser.viewMenuButtonAccessibleName = \u8868\u793A\u30E1\u30CB\u30E5\u30FC
+FileChooser.detailsViewActionLabelText=\u8A73\u7D30
+FileChooser.refreshActionLabelText=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5
+FileChooser.viewMenuLabelText=\u8868\u793A
+FileChooser.fileNameHeaderText=\u540D\u524D
+FileChooser.fileSizeHeaderText=\u30B5\u30A4\u30BA
+FileChooser.fileTypeHeaderText=\u30BF\u30A4\u30D7
+FileChooser.fileDateHeaderText=\u4FEE\u6B63\u65E5
+FileChooser.fileAttrHeaderText=\u5C5E\u6027
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -18,33 +18,30 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=\uac80\uc0c9 \uc704\uce58:
-FileChooser.saveInLabelText=\uc800\uc7a5 \uc704\uce58:
-FileChooser.fileNameLabelText=\ud30c\uc77c \uc774\ub984:
-FileChooser.folderNameLabelText=Folder name:
-FileChooser.filesOfTypeLabelText=\ud30c\uc77c \uc885\ub958:
-FileChooser.upFolderToolTipText=\ud55c \ub2e8\uacc4 \uc704\ub85c
-FileChooser.upFolderAccessibleName=\uc704
-FileChooser.homeFolderToolTipText=\ud648
-FileChooser.homeFolderAccessibleName=\ud648
-FileChooser.newFolderToolTipText=\uc0c8 \ud3f4\ub354 \uc791\uc131
-FileChooser.newFolderAccessibleName=\uc0c8 \ud3f4\ub354
-FileChooser.newFolderActionLabelText=\uc0c8 \ud3f4\ub354
-FileChooser.listViewButtonToolTipText=\ubaa9\ub85d
-FileChooser.listViewButtonAccessibleName=\ubaa9\ub85d
-FileChooser.listViewActionLabelText=\ubaa9\ub85d
-FileChooser.detailsViewButtonToolTipText=\uc790\uc138\ud788
-FileChooser.detailsViewButtonAccessibleName=\uc790\uc138\ud788
-FileChooser.viewMenuButtonToolTipText = View Menu
-FileChooser.viewMenuButtonAccessibleName = View Menu
-FileChooser.detailsViewActionLabelText=\uc790\uc138\ud788
-FileChooser.refreshActionLabelText=\uac31\uc2e0
-FileChooser.viewMenuLabelText=\ubcf4\uae30
-FileChooser.fileNameHeaderText=\uc774\ub984
-FileChooser.fileSizeHeaderText=\ud06c\uae30
-FileChooser.fileTypeHeaderText=\uc885\ub958
-FileChooser.fileDateHeaderText=\uc218\uc815
-FileChooser.fileAttrHeaderText=\uc18d\uc131
-FileChooser.directoryOpenButtonText=\uc5f4\uae30(O)
-FileChooser.openButtonText=\uc5f4\uae30(O)
-FileChooser.saveButtonText=\uc800\uc7a5(S)
+FileChooser.lookInLabelText=\uAC80\uC0C9 \uC704\uCE58:
+FileChooser.saveInLabelText=\uC800\uC7A5 \uC704\uCE58:
+FileChooser.fileNameLabelText=\uD30C\uC77C \uC774\uB984:
+FileChooser.folderNameLabelText=\uD3F4\uB354 \uC774\uB984:
+FileChooser.filesOfTypeLabelText=\uD30C\uC77C \uC720\uD615:
+FileChooser.upFolderToolTipText=\uD55C \uB808\uBCA8 \uC704\uB85C
+FileChooser.upFolderAccessibleName=\uC704\uB85C
+FileChooser.homeFolderToolTipText=\uD648
+FileChooser.homeFolderAccessibleName=\uD648
+FileChooser.newFolderToolTipText=\uC0C8 \uD3F4\uB354 \uC0DD\uC131
+FileChooser.newFolderAccessibleName=\uC0C8 \uD3F4\uB354
+FileChooser.newFolderActionLabelText=\uC0C8 \uD3F4\uB354
+FileChooser.listViewButtonToolTipText=\uBAA9\uB85D
+FileChooser.listViewButtonAccessibleName=\uBAA9\uB85D
+FileChooser.listViewActionLabelText=\uBAA9\uB85D
+FileChooser.detailsViewButtonToolTipText=\uC138\uBD80 \uC815\uBCF4
+FileChooser.detailsViewButtonAccessibleName=\uC138\uBD80 \uC815\uBCF4
+FileChooser.viewMenuButtonToolTipText = \uBCF4\uAE30 \uBA54\uB274
+FileChooser.viewMenuButtonAccessibleName = \uBCF4\uAE30 \uBA54\uB274
+FileChooser.detailsViewActionLabelText=\uC138\uBD80 \uC815\uBCF4
+FileChooser.refreshActionLabelText=\uC0C8\uB85C \uACE0\uCE68
+FileChooser.viewMenuLabelText=\uBCF4\uAE30
+FileChooser.fileNameHeaderText=\uC774\uB984
+FileChooser.fileSizeHeaderText=\uD06C\uAE30
+FileChooser.fileTypeHeaderText=\uC720\uD615
+FileChooser.fileDateHeaderText=\uC218\uC815 \uB0A0\uC9DC
+FileChooser.fileAttrHeaderText=\uC18D\uC131
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -20,20 +20,23 @@
 
 FileChooser.lookInLabelText=Consultar em:
 FileChooser.saveInLabelText=Salvar em:
-FileChooser.fileNameLabelText=Nome de arquivo:
-FileChooser.filesOfTypeLabelText=Arquivos de tipo:
-FileChooser.upFolderToolTipText=Um n\u00edvel acima
+FileChooser.fileNameLabelText=Nome do arquivo:
+FileChooser.folderNameLabelText=Nome da pasta:
+FileChooser.filesOfTypeLabelText=Arquivos do tipo:
+FileChooser.upFolderToolTipText=Um N\u00EDvel Acima
 FileChooser.upFolderAccessibleName=Acima
-FileChooser.homeFolderToolTipText=In\u00edcio
-FileChooser.homeFolderAccessibleName=In\u00edcio
-FileChooser.newFolderToolTipText=Criar nova pasta
-FileChooser.newFolderAccessibleName=Nova pasta
-FileChooser.newFolderActionLabelText=Nova pasta
+FileChooser.homeFolderToolTipText=In\u00EDcio
+FileChooser.homeFolderAccessibleName=In\u00EDcio
+FileChooser.newFolderToolTipText=Criar Nova Pasta
+FileChooser.newFolderAccessibleName=Nova Pasta
+FileChooser.newFolderActionLabelText=Nova Pasta
 FileChooser.listViewButtonToolTipText=Lista
 FileChooser.listViewButtonAccessibleName=Lista
 FileChooser.listViewActionLabelText=Lista
 FileChooser.detailsViewButtonToolTipText=Detalhes
 FileChooser.detailsViewButtonAccessibleName=Detalhes
+FileChooser.viewMenuButtonToolTipText = Exibir Menu
+FileChooser.viewMenuButtonAccessibleName = Exibir Menu
 FileChooser.detailsViewActionLabelText=Detalhes
 FileChooser.refreshActionLabelText=Atualizar
 FileChooser.viewMenuLabelText=Exibir
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -21,9 +21,9 @@
 FileChooser.lookInLabelText=Leta i:
 FileChooser.saveInLabelText=Spara i:
 FileChooser.fileNameLabelText=Filnamn:
-FileChooser.folderNameLabelText=Folder name:
+FileChooser.folderNameLabelText=Mapp:
 FileChooser.filesOfTypeLabelText=Filformat:
-FileChooser.upFolderToolTipText=Upp en niv\u00e5
+FileChooser.upFolderToolTipText=Upp en niv\u00E5
 FileChooser.upFolderAccessibleName=Upp
 FileChooser.homeFolderToolTipText=Hem
 FileChooser.homeFolderAccessibleName=Hem
@@ -33,15 +33,15 @@
 FileChooser.listViewButtonToolTipText=Lista
 FileChooser.listViewButtonAccessibleName=Lista
 FileChooser.listViewActionLabelText=Lista
-FileChooser.detailsViewButtonToolTipText=Detaljerad lista
-FileChooser.detailsViewButtonAccessibleName=Detaljerad lista
-FileChooser.viewMenuButtonToolTipText = View Menu
-FileChooser.viewMenuButtonAccessibleName = View Menu
-FileChooser.detailsViewActionLabelText=Detaljerad lista
-FileChooser.refreshActionLabelText=Uppdatera
+FileChooser.detailsViewButtonToolTipText=Detaljer
+FileChooser.detailsViewButtonAccessibleName=Detaljer
+FileChooser.viewMenuButtonToolTipText = Menyn Visa
+FileChooser.viewMenuButtonAccessibleName = Menyn Visa
+FileChooser.detailsViewActionLabelText=Detaljer
+FileChooser.refreshActionLabelText=F\u00F6rnya
 FileChooser.viewMenuLabelText=Vy
 FileChooser.fileNameHeaderText=Namn
 FileChooser.fileSizeHeaderText=Storlek
 FileChooser.fileTypeHeaderText=Typ
-FileChooser.fileDateHeaderText=\u00c4ndrad
+FileChooser.fileDateHeaderText=\u00C4ndrad
 FileChooser.fileAttrHeaderText=Attribut
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -18,33 +18,30 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=\u67e5\u770b\uff1a
-FileChooser.saveInLabelText=\u4fdd\u5b58\uff1a
-FileChooser.fileNameLabelText=\u6587\u4ef6\u540d\uff1a
-FileChooser.folderNameLabelText=Folder name:
-FileChooser.filesOfTypeLabelText=\u6587\u4ef6\u7c7b\u578b\uff1a
-FileChooser.upFolderToolTipText=\u5411\u4e0a\u4e00\u5c42
-FileChooser.upFolderAccessibleName=\u5411\u4e0a
-FileChooser.homeFolderToolTipText=\u8d77\u59cb\u76ee\u5f55
-FileChooser.homeFolderAccessibleName=\u8d77\u59cb\u76ee\u5f55
-FileChooser.newFolderToolTipText=\u521b\u5efa\u65b0\u7684\u6587\u4ef6\u5939
-FileChooser.newFolderAccessibleName=\u65b0\u5efa\u6587\u4ef6\u5939
-FileChooser.newFolderActionLabelText=\u65b0\u5efa\u6587\u4ef6\u5939
+FileChooser.lookInLabelText=\u67E5\u770B: 
+FileChooser.saveInLabelText=\u4FDD\u5B58: 
+FileChooser.fileNameLabelText=\u6587\u4EF6\u540D: 
+FileChooser.folderNameLabelText=\u6587\u4EF6\u5939\u540D: 
+FileChooser.filesOfTypeLabelText=\u6587\u4EF6\u7C7B\u578B: 
+FileChooser.upFolderToolTipText=\u5411\u4E0A\u4E00\u7EA7
+FileChooser.upFolderAccessibleName=\u5411\u4E0A
+FileChooser.homeFolderToolTipText=\u4E3B\u76EE\u5F55
+FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u5F55
+FileChooser.newFolderToolTipText=\u521B\u5EFA\u65B0\u6587\u4EF6\u5939
+FileChooser.newFolderAccessibleName=\u65B0\u5EFA\u6587\u4EF6\u5939
+FileChooser.newFolderActionLabelText=\u65B0\u5EFA\u6587\u4EF6\u5939
 FileChooser.listViewButtonToolTipText=\u5217\u8868
 FileChooser.listViewButtonAccessibleName=\u5217\u8868
 FileChooser.listViewActionLabelText=\u5217\u8868
-FileChooser.detailsViewButtonToolTipText=\u8be6\u7ec6\u4fe1\u606f
-FileChooser.detailsViewButtonAccessibleName=\u8be6\u7ec6\u4fe1\u606f
-FileChooser.viewMenuButtonToolTipText = View Menu
-FileChooser.viewMenuButtonAccessibleName = View Menu
-FileChooser.detailsViewActionLabelText=\u8be6\u7ec6\u4fe1\u606f
-FileChooser.refreshActionLabelText=\u5237\u65b0
-FileChooser.viewMenuLabelText=\u89c6\u56fe
-FileChooser.fileNameHeaderText=\u540d\u79f0
-FileChooser.fileSizeHeaderText=\u5927\u5c0f
-FileChooser.fileTypeHeaderText=\u7c7b\u578b
-FileChooser.fileDateHeaderText=\u4fee\u8ba2\u7248
-FileChooser.fileAttrHeaderText=\u5c5e\u6027
-FileChooser.directoryOpenButtonText=\u6253\u5f00(O)
-FileChooser.openButtonText=\u6253\u5f00(O)
-FileChooser.saveButtonText=\u4fdd\u5b58(S)
+FileChooser.detailsViewButtonToolTipText=\u8BE6\u7EC6\u8D44\u6599
+FileChooser.detailsViewButtonAccessibleName=\u8BE6\u7EC6\u8D44\u6599
+FileChooser.viewMenuButtonToolTipText = \u67E5\u770B\u83DC\u5355
+FileChooser.viewMenuButtonAccessibleName = \u67E5\u770B\u83DC\u5355
+FileChooser.detailsViewActionLabelText=\u8BE6\u7EC6\u8D44\u6599
+FileChooser.refreshActionLabelText=\u5237\u65B0
+FileChooser.viewMenuLabelText=\u89C6\u56FE
+FileChooser.fileNameHeaderText=\u540D\u79F0
+FileChooser.fileSizeHeaderText=\u5927\u5C0F
+FileChooser.fileTypeHeaderText=\u7C7B\u578B
+FileChooser.fileDateHeaderText=\u4FEE\u6539\u65E5\u671F
+FileChooser.fileAttrHeaderText=\u5C5E\u6027
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties	Thu Jan 27 22:35:53 2011 -0800
+++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties	Sun Feb 20 12:46:58 2011 -0800
@@ -18,33 +18,30 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=\u67e5\u770b\ufe55
-FileChooser.saveInLabelText=\u5132\u5b58\u65bc\uff1a
-FileChooser.fileNameLabelText=\u6a94\u6848\u540d\u7a31\ufe55
-FileChooser.folderNameLabelText=Folder name:
-FileChooser.filesOfTypeLabelText=\u6a94\u6848\u985e\u578b\ufe55
-FileChooser.upFolderToolTipText=\u5f80\u4e0a\u4e00\u5c64
-FileChooser.upFolderAccessibleName=\u5f80\u4e0a
-FileChooser.homeFolderToolTipText=\u56de\u4e3b\u76ee\u9304
-FileChooser.homeFolderAccessibleName=\u4e3b\u76ee\u9304
-FileChooser.newFolderToolTipText=\u5efa\u7acb\u65b0\u8cc7\u6599\u593e
-FileChooser.newFolderAccessibleName=\u65b0\u8cc7\u6599\u593e
-FileChooser.newFolderActionLabelText=\u65b0\u8cc7\u6599\u593e
-FileChooser.listViewButtonToolTipText=\u6a94\u6848\u6e05\u55ae
-FileChooser.listViewButtonAccessibleName=\u6e05\u55ae
-FileChooser.listViewActionLabelText=\u6e05\u55ae
-FileChooser.detailsViewButtonToolTipText=\u8a73\u7d30\u8cc7\u8a0a
-FileChooser.detailsViewButtonAccessibleName=\u8a73\u7d30\u8cc7\u8a0a
-FileChooser.viewMenuButtonToolTipText = View Menu
-FileChooser.viewMenuButtonAccessibleName = View Menu
-FileChooser.detailsViewActionLabelText=\u8a73\u7d30\u8cc7\u8a0a
-FileChooser.refreshActionLabelText=\u66f4\u65b0
-FileChooser.viewMenuLabelText=\u6aa2\u8996
-FileChooser.fileNameHeaderText=\u540d\u7a31
-FileChooser.fileSizeHeaderText=\u5927\u5c0f
-FileChooser.fileTypeHeaderText=\u985e\u578b
-FileChooser.fileDateHeaderText=\u4fee\u6539
-FileChooser.fileAttrHeaderText=\u5c6c\u6027
-FileChooser.directoryOpenButtonText=\u958b\u555f(O)
-FileChooser.openButtonText=\u958b\u555f(O)
-FileChooser.saveButtonText=\u5132\u5b58(S)