OpenJDK / jigsaw / jake / jdk

--- a/.hgtags	Fri Apr 15 14:42:09 2011 +0100
+++ b/.hgtags	Tue Apr 19 16:01:27 2011 -0700
@@ -112,3 +112,4 @@
 d8ced728159fbb2caa8b6adb477fd8efdbbdf179 jdk7-b135
 aa13e7702cd9d8aca9aa38f1227f966990866944 jdk7-b136
 29296ea6529a418037ccce95903249665ef31c11 jdk7-b137
+60d3d55dcc9c31a30ced9caa6ef5c0dcd7db031d jdk7-b138
--- a/make/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 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
--- a/make/com/sun/crypto/provider/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/com/sun/crypto/provider/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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
--- a/make/com/sun/java/pack/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/com/sun/java/pack/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 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
--- a/make/com/sun/java/pack/prop/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/com/sun/java/pack/prop/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 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
--- a/make/com/sun/jndi/cosnaming/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/com/sun/jndi/cosnaming/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 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
--- a/make/com/sun/jndi/dns/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/com/sun/jndi/dns/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 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
--- a/make/com/sun/jndi/ldap/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/com/sun/jndi/ldap/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 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
--- a/make/com/sun/jndi/rmi/registry/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/com/sun/jndi/rmi/registry/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 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
--- a/make/com/sun/nio/sctp/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/com/sun/nio/sctp/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 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
--- a/make/com/sun/org/apache/xml/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/com/sun/org/apache/xml/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 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
--- a/make/com/sun/rowset/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/com/sun/rowset/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 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
--- a/make/com/sun/script/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/com/sun/script/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, 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
--- a/make/com/sun/security/auth/module/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/com/sun/security/auth/module/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 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
--- a/make/com/sun/servicetag/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/com/sun/servicetag/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 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
--- a/make/com/sun/tools/attach/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/com/sun/tools/attach/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, 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
--- a/make/common/Defs-solaris.gmk	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/common/Defs-solaris.gmk	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 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
--- a/make/common/Defs-windows.gmk	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/common/Defs-windows.gmk	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 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
--- a/make/common/Demo.gmk	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/common/Demo.gmk	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 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
--- a/make/common/Program.gmk	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/common/Program.gmk	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 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
--- a/make/common/Sanity.gmk	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/common/Sanity.gmk	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 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
--- a/make/common/Subdirs.gmk	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/common/Subdirs.gmk	Tue Apr 19 16:01:27 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 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
--- a/make/common/shared/Compiler-msvc.gmk	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/common/shared/Compiler-msvc.gmk	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, 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
--- a/make/common/shared/Defs-control.gmk	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/common/shared/Defs-control.gmk	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 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
--- a/make/common/shared/Defs-javadoc.gmk	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/common/shared/Defs-javadoc.gmk	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
--- a/make/common/shared/Defs-solaris.gmk	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/common/shared/Defs-solaris.gmk	Tue Apr 19 16:01:27 2011 -0700
@@ -194,13 +194,30 @@
 MAPFILE_WARNING-=WARNING
 MAPFILE_WARNING=$(MAPFILE_WARNING-$(VARIANT))

+# Some libraries do not have mapfiles for multiple reasons.
+#   These libraries for sparc and sparcv9 are exceptions to the mapfile rule:
+#     libjdgaSUNWafb.so
+#     libjdgaSUNWcg6.so
+#     libjdgaSUNWffb.so
+#     libjdgaSUNWm64.so
+#     libxinerama.so
+#   The library libJdbcOdbc.so has also been given an exception.
+#   The JNI/JVMTI demo libraries are also missing mapfiles, no exceptions yet.
+ifeq ($(ARCH_FAMILY),sparc)
+  MAPFILE_EXCEPTIONS = \
+    (libJdbcOdbc|libjdgaSUNWafb|libjdgaSUNWcg6|libjdgaSUNWffb|libjdgaSUNWm64|libxinerama)
+else
+  MAPFILE_EXCEPTIONS = (libJdbcOdbc)
+endif
+
 # Macro to check it's input file for banned dependencies and verify the
 #   binary built properly. Relies on process exit code.
 ifndef CROSS_COMPILE_ARCH
 define binary_file_verification # binary_file
 ( \
   $(ECHO) "Checking for mapfile use in: $1" && \
-  if [ "`$(NM) -g -D $1 | $(EGREP) -v 'UNDEF' | $(EGREP) 'SUNWprivate'`" = "" ] ; then \
+  if [ "`$(ECHO) $(basename $(notdir $1)) | $(EGREP) '$(MAPFILE_EXCEPTIONS)'`" = "" \
+       -a "`$(NM) -g -D $1 | $(EGREP) -v 'UNDEF' | $(EGREP) 'SUNWprivate'`" = "" ] ; then \
     $(ECHO) "$(MAPFILE_WARNING): File was not built with a mapfile: $1"; \
   fi && \
   $(ECHO) "Library loads for: $1" && \
--- a/make/common/shared/Defs-windows.gmk	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/common/shared/Defs-windows.gmk	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, 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
--- a/make/common/shared/Defs.gmk	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/common/shared/Defs.gmk	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, 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
--- a/make/docs/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/docs/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
@@ -40,7 +40,7 @@
 COPYRIGHT_URL = $(COPYRIGHT_URL-$(JDK_MINOR_VERSION))

 # Url to bug filing site
-BUG_SUBMIT_URL = http://bugs.sun.com/services/bugreport/index.jsp
+BUG_SUBMIT_URL = http://bugreport.sun.com/bugreport/

 # Common line for how to submit a bug or rfe
 BUG_SUBMIT_LINE = <a href="$(BUG_SUBMIT_URL)">Submit a bug or feature</a>
--- a/make/docs/NON_CORE_PKGS.gmk	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/docs/NON_CORE_PKGS.gmk	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 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
--- a/make/java/awt/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/java/awt/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 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
--- a/make/java/fdlibm/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/java/fdlibm/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 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
--- a/make/java/java/FILES_java.gmk	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/java/java/FILES_java.gmk	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 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
--- a/make/java/java/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/java/java/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
--- a/make/java/java_crw_demo/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/java/java_crw_demo/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 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
--- a/make/java/java_hprof_demo/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/java/java_hprof_demo/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 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
--- a/make/java/jli/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/java/jli/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, 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
--- a/make/java/logging/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/java/logging/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 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
--- a/make/java/main/java/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/java/main/java/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 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
--- a/make/java/main/javaw/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/java/main/javaw/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 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
--- a/make/java/management/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/java/management/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 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
--- a/make/java/net/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/java/net/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 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
--- a/make/java/nio/FILES_java.gmk	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/java/nio/FILES_java.gmk	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 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
--- a/make/java/nio/mapfile-linux	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/java/nio/mapfile-linux	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 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
--- a/make/java/nio/mapfile-solaris	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/java/nio/mapfile-solaris	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 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
--- a/make/java/npt/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/java/npt/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 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
--- a/make/java/redist/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/java/redist/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
--- a/make/java/redist/fonts/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/java/redist/fonts/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 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
--- a/make/java/redist/sajdi/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/java/redist/sajdi/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
--- a/make/java/sql/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/java/sql/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 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
--- a/make/java/text/base/FILES_java.gmk	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/java/text/base/FILES_java.gmk	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 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
--- a/make/java/text/base/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/java/text/base/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 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
--- a/make/java/util/FILES_properties.gmk	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/java/util/FILES_properties.gmk	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2007, 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
@@ -55,6 +55,7 @@
         sun/util/resources/LocaleNames_mt.properties \
         sun/util/resources/LocaleNames_nl.properties \
         sun/util/resources/LocaleNames_no.properties \
+        sun/util/resources/LocaleNames_no_NO_NY.properties \
         sun/util/resources/LocaleNames_pl.properties \
         sun/util/resources/LocaleNames_pt.properties \
         sun/util/resources/LocaleNames_pt_BR.properties \
--- a/make/java/verify/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/java/verify/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 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
--- a/make/javax/crypto/Defs-jce.gmk	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/javax/crypto/Defs-jce.gmk	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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
--- a/make/javax/crypto/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/javax/crypto/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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
--- a/make/javax/imageio/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/javax/imageio/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 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
--- a/make/javax/print/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/javax/print/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 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
--- a/make/javax/sound/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/javax/sound/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 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
--- a/make/javax/sound/jsoundalsa/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/javax/sound/jsoundalsa/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 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
--- a/make/javax/sound/jsoundds/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/javax/sound/jsoundds/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 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
--- a/make/javax/sql/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/javax/sql/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 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
--- a/make/javax/swing/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/javax/swing/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 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
--- a/make/javax/swing/plaf/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/javax/swing/plaf/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 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
--- a/make/jdk_generic_profile.sh	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/jdk_generic_profile.sh	Tue Apr 19 16:01:27 2011 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh

 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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
--- a/make/jpda/back/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/jpda/back/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 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
--- a/make/jpda/transport/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/jpda/transport/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 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
--- a/make/jpda/transport/shmem/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/jpda/transport/shmem/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 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
--- a/make/jpda/transport/socket/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/jpda/transport/socket/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 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
--- a/make/jpda/tty/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/jpda/tty/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 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
--- a/make/mkdemo/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/mkdemo/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
--- a/make/mkdemo/jfc/Font2DTest/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/mkdemo/jfc/Font2DTest/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 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
--- a/make/mkdemo/jfc/Java2D/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/mkdemo/jfc/Java2D/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 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
--- a/make/mkdemo/jfc/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/mkdemo/jfc/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
--- a/make/mkdemo/jfc/SwingApplet/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/mkdemo/jfc/SwingApplet/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
--- a/make/mkdemo/jfc/SwingSet2/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/mkdemo/jfc/SwingSet2/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 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
--- a/make/mkdemo/jfc/SwingSet3/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/mkdemo/jfc/SwingSet3/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 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
--- a/make/mkdemo/jpda/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/mkdemo/jpda/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 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
--- a/make/mkdemo/jvmti/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/mkdemo/jvmti/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 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
--- a/make/mkdemo/management/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/mkdemo/management/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 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
--- a/make/mksample/dtrace/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/mksample/dtrace/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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
--- a/make/mksample/jmx/jmx-scandir/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/mksample/jmx/jmx-scandir/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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
--- a/make/mksample/nbproject/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/mksample/nbproject/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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
--- a/make/mksample/nio/file/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/mksample/nio/file/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 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
--- a/make/mksample/nio/multicast/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/mksample/nio/multicast/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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
--- a/make/mksample/nio/server/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/mksample/nio/server/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 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
--- a/make/mksample/scripting/scriptpad/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/mksample/scripting/scriptpad/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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
--- a/make/mksample/webservices/EbayClient/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/mksample/webservices/EbayClient/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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
--- a/make/mksample/webservices/EbayServer/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/mksample/webservices/EbayServer/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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
--- a/make/netbeans/common/java-data-native.ent	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/netbeans/common/java-data-native.ent	Tue Apr 19 16:01:27 2011 -0700
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--
- Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.

  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
--- a/make/netbeans/common/java-data-no-native.ent	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/netbeans/common/java-data-no-native.ent	Tue Apr 19 16:01:27 2011 -0700
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--
- Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.

  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
--- a/make/sun/applet/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/applet/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 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
--- a/make/sun/awt/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/awt/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 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
--- a/make/sun/awt/mapfile-mawt-vers	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/awt/mapfile-mawt-vers	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 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
--- a/make/sun/awt/mapfile-vers-linux	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/awt/mapfile-vers-linux	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 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
--- a/make/sun/cmm/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/cmm/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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
--- a/make/sun/cmm/kcms/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/cmm/kcms/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
--- a/make/sun/cmm/lcms/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/cmm/lcms/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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
--- a/make/sun/dcpr/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/dcpr/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
--- a/make/sun/font/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/font/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
--- a/make/sun/font/t2k/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/font/t2k/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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
--- a/make/sun/headless/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/headless/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 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
--- a/make/sun/headless/mapfile-vers	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/headless/mapfile-vers	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 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
--- a/make/sun/image/generic/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/image/generic/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 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
--- a/make/sun/image/vis/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/image/vis/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 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
--- a/make/sun/jar/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/jar/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 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
--- a/make/sun/javazic/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/javazic/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 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
--- a/make/sun/jconsole/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/jconsole/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 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
--- a/make/sun/jdbc/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/jdbc/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 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
--- a/make/sun/jdga/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/jdga/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 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
--- a/make/sun/jpeg/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/jpeg/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 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
--- a/make/sun/launcher/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/launcher/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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
--- a/make/sun/management/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/management/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 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
--- a/make/sun/native2ascii/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/native2ascii/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 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
--- a/make/sun/net/others/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/net/others/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 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
--- a/make/sun/net/spi/nameservice/dns/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/net/spi/nameservice/dns/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 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
--- a/make/sun/nio/cs/FILES_java.gmk	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/nio/cs/FILES_java.gmk	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, 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
--- a/make/sun/org/mozilla/javascript/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/org/mozilla/javascript/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, 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
--- a/make/sun/pisces/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/pisces/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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
--- a/make/sun/rmi/cgi/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/rmi/cgi/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 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
--- a/make/sun/rmi/oldtools/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/rmi/oldtools/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
--- a/make/sun/rmi/registry/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/rmi/registry/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 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
--- a/make/sun/rmi/rmi/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/rmi/rmi/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 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
--- a/make/sun/rmi/rmic/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/rmi/rmic/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 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
--- a/make/sun/rmi/rmid/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/rmi/rmid/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
--- a/make/sun/security/ec/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/security/ec/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 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
--- a/make/sun/security/jgss/wrapper/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/security/jgss/wrapper/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, 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
--- a/make/sun/security/krb5/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/security/krb5/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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
--- a/make/sun/security/mscapi/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/security/mscapi/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, 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
--- a/make/sun/security/pkcs11/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/security/pkcs11/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 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
--- a/make/sun/security/smartcardio/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/security/smartcardio/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, 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
--- a/make/sun/serialver/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/serialver/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 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
--- a/make/sun/splashscreen/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/splashscreen/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, 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
--- a/make/sun/text/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/text/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 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
--- a/make/sun/tools/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/tools/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, 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
--- a/make/sun/tracing/dtrace/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/sun/tracing/dtrace/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 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
--- a/make/tools/reorder/Makefile	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/tools/reorder/Makefile	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 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
--- a/make/tools/src/build/tools/javazic/Zoneinfo.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/make/tools/src/build/tools/javazic/Zoneinfo.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/back/debugInit.c	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/back/debugInit.c	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
--- a/src/share/back/eventFilter.c	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/back/eventFilter.c	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
--- a/src/share/bin/java.c	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/bin/java.c	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 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
--- a/src/share/bin/java.h	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/bin/java.h	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
--- a/src/share/classes/com/sun/beans/TypeResolver.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/beans/TypeResolver.java	Tue Apr 19 16:01:27 2011 -0700
@@ -356,7 +356,7 @@
     /**
      * Replaces a {@link GenericArrayType GenericArrayType}
      * with plain array class where it is possible.
-     * Bug <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5041784">5041784</a>
+     * Bug <a href="http://bugs.sun.com/view_bug.do?bug_id=5041784">5041784</a>
      * is that arrays of non-generic type sometimes show up
      * as {@link GenericArrayType GenericArrayType} when using reflection.
      * For example, a {@code String[]} might show up
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -21,10 +21,10 @@
 # character of GTKColorChooserPanel.hueText should be underlined to
 # represent the mnemonic.
 GTKColorChooserPanel.hueText=Farbton:
-GTKColorChooserPanel.hueMnemonic=72
+GTKColorChooserPanel.hueMnemonic=70

 GTKColorChooserPanel.redText=Rot:
-GTKColorChooserPanel.redMnemonic=69
+GTKColorChooserPanel.redMnemonic=79

 GTKColorChooserPanel.saturationText=S\u00E4ttigung:
 GTKColorChooserPanel.saturationMnemonic=83
@@ -33,12 +33,12 @@
 GTKColorChooserPanel.greenMnemonic=71

 GTKColorChooserPanel.valueText=Wert:
-GTKColorChooserPanel.valueMnemonic=86
+GTKColorChooserPanel.valueMnemonic=87

 GTKColorChooserPanel.blueText=Blau:
 GTKColorChooserPanel.blueMnemonic=66

-GTKColorChooserPanel.colorNameText=Name der Farbe:
+GTKColorChooserPanel.colorNameText=Farbname:
 GTKColorChooserPanel.colorNameMnemonic=78


@@ -54,9 +54,9 @@
 FileChooser.deleteFileButtonText=Datei l\u00F6schen
 FileChooser.deleteFileButtonMnemonic=76
 FileChooser.renameFileButtonText=Datei umbenennen
-FileChooser.renameFileButtonMnemonic=82
+FileChooser.renameFileButtonMnemonic=85
 FileChooser.cancelButtonText=Abbrechen
-FileChooser.cancelButtonMnemonic=67
+FileChooser.cancelButtonMnemonic=65
 FileChooser.saveButtonText=OK
 FileChooser.saveButtonMnemonic=79
 FileChooser.openButtonText=OK
@@ -65,19 +65,20 @@
 FileChooser.openDialogTitleText=\u00D6ffnen
 FileChooser.pathLabelText=Auswahl:
 FileChooser.filterLabelText=Filter:
-FileChooser.pathLabelMnemonic=83
+FileChooser.pathLabelMnemonic=87
 FileChooser.foldersLabelText=Ordner
-FileChooser.foldersLabelMnemonic=68
+FileChooser.foldersLabelMnemonic=79
 FileChooser.filesLabelText=Dateien
-FileChooser.filesLabelMnemonic=70
+FileChooser.filesLabelMnemonic=68

 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.renameFileErrorTitle=Fehler
 FileChooser.renameFileErrorText=Fehler beim Umbenennen der Datei "{0}" in "{1}"

 OptionPane.okButtonMnemonic=79
-OptionPane.cancelButtonMnemonic=67
+OptionPane.cancelButtonMnemonic=65
+
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -20,23 +20,23 @@
 # GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second
 # character of GTKColorChooserPanel.hueText should be underlined to
 # represent the mnemonic.
-GTKColorChooserPanel.hueText=Matiz:
-GTKColorChooserPanel.hueMnemonic=72
+GTKColorChooserPanel.hueText=Mat:
+GTKColorChooserPanel.hueMnemonic=77

 GTKColorChooserPanel.redText=Rojo:
-GTKColorChooserPanel.redMnemonic=69
+GTKColorChooserPanel.redMnemonic=74

 GTKColorChooserPanel.saturationText=Saturaci\u00F3n:
 GTKColorChooserPanel.saturationMnemonic=83

 GTKColorChooserPanel.greenText=Verde:
-GTKColorChooserPanel.greenMnemonic=71
+GTKColorChooserPanel.greenMnemonic=86

 GTKColorChooserPanel.valueText=Valor:
 GTKColorChooserPanel.valueMnemonic=86

 GTKColorChooserPanel.blueText=Azul:
-GTKColorChooserPanel.blueMnemonic=66
+GTKColorChooserPanel.blueMnemonic=65

 GTKColorChooserPanel.colorNameText=Nombre del Color:
 GTKColorChooserPanel.colorNameMnemonic=78
@@ -52,32 +52,33 @@
 FileChooser.newFolderNoDirectoryErrorTitleText=Error
 FileChooser.newFolderNoDirectoryErrorText=Error al crear el directorio "{0}": no existe dicho archivo o directorio
 FileChooser.deleteFileButtonText=Suprimir Archivo
-FileChooser.deleteFileButtonMnemonic=76
-FileChooser.renameFileButtonText=Cambiar Nombre a Archivo
+FileChooser.deleteFileButtonMnemonic=80
+FileChooser.renameFileButtonText=Cambiar Nombre de Archivo
 FileChooser.renameFileButtonMnemonic=82
 FileChooser.cancelButtonText=Cancelar
 FileChooser.cancelButtonMnemonic=67
 FileChooser.saveButtonText=Aceptar
-FileChooser.saveButtonMnemonic=79
+FileChooser.saveButtonMnemonic=65
 FileChooser.openButtonText=Aceptar
-FileChooser.openButtonMnemonic=79
+FileChooser.openButtonMnemonic=65
 FileChooser.saveDialogTitleText=Guardar
 FileChooser.openDialogTitleText=Abrir
 FileChooser.pathLabelText=Selecci\u00F3n:
 FileChooser.filterLabelText=Filtro:
 FileChooser.pathLabelMnemonic=83
 FileChooser.foldersLabelText=Carpetas
-FileChooser.foldersLabelMnemonic=68
+FileChooser.foldersLabelMnemonic=84
 FileChooser.filesLabelText=Archivos
-FileChooser.filesLabelMnemonic=70
+FileChooser.filesLabelMnemonic=65

 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.renameFileErrorTitle=Error
 FileChooser.renameFileErrorText=Error al cambiar el nombre del archivo "{0}" a "{1}"

-OptionPane.okButtonMnemonic=79
+OptionPane.okButtonMnemonic=65
 OptionPane.cancelButtonMnemonic=67
+
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -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=72
+GTKColorChooserPanel.hueText=Teinte :
+GTKColorChooserPanel.hueMnemonic=84

 GTKColorChooserPanel.redText=Rouge\u00A0:
 GTKColorChooserPanel.redMnemonic=69

-GTKColorChooserPanel.saturationText=Saturation\u00A0:
+GTKColorChooserPanel.saturationText=Saturation :
 GTKColorChooserPanel.saturationMnemonic=83

-GTKColorChooserPanel.greenText=Vert\u00A0:
-GTKColorChooserPanel.greenMnemonic=71
+GTKColorChooserPanel.greenText=Vert :
+GTKColorChooserPanel.greenMnemonic=86

-GTKColorChooserPanel.valueText=Valeur\u00A0:
+GTKColorChooserPanel.valueText=Valeur :
 GTKColorChooserPanel.valueMnemonic=86

-GTKColorChooserPanel.blueText=Bleu\u00A0:
+GTKColorChooserPanel.blueText=Bleu :
 GTKColorChooserPanel.blueMnemonic=66

-GTKColorChooserPanel.colorNameText=Nom de la couleur\u00A0:
+GTKColorChooserPanel.colorNameText=Nom de couleur :
 GTKColorChooserPanel.colorNameMnemonic=78


@@ -56,14 +56,14 @@
 FileChooser.renameFileButtonText=Renommer le fichier
 FileChooser.renameFileButtonMnemonic=82
 FileChooser.cancelButtonText=Annuler
-FileChooser.cancelButtonMnemonic=67
+FileChooser.cancelButtonMnemonic=65
 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 :
 FileChooser.filterLabelText=Filtre :
 FileChooser.pathLabelMnemonic=83
 FileChooser.foldersLabelText=Dossiers
@@ -76,8 +76,9 @@
 FileChooser.openButtonToolTipText=Ouvre le fichier s\u00E9lectionn\u00E9.

 FileChooser.renameFileDialogText=Renomme le fichier "{0}" en
-FileChooser.renameFileErrorTitle=Erreur
+FileChooser.renameFileErrorTitle=Erreur
 FileChooser.renameFileErrorText=Erreur lors du changement de nom du fichier "{0}" en "{1}"

 OptionPane.okButtonMnemonic=79
-OptionPane.cancelButtonMnemonic=67
+OptionPane.cancelButtonMnemonic=65
+
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -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=72
+GTKColorChooserPanel.hueText=Ton.:
+GTKColorChooserPanel.hueMnemonic=84

 GTKColorChooserPanel.redText=Rosso:
-GTKColorChooserPanel.redMnemonic=69
+GTKColorChooserPanel.redMnemonic=79

 GTKColorChooserPanel.saturationText=Saturazione:
 GTKColorChooserPanel.saturationMnemonic=83

 GTKColorChooserPanel.greenText=Verde:
-GTKColorChooserPanel.greenMnemonic=71
+GTKColorChooserPanel.greenMnemonic=86

 GTKColorChooserPanel.valueText=Valore:
 GTKColorChooserPanel.valueMnemonic=86
@@ -56,7 +56,7 @@
 FileChooser.renameFileButtonText=Rinomina file
 FileChooser.renameFileButtonMnemonic=82
 FileChooser.cancelButtonText=Annulla
-FileChooser.cancelButtonMnemonic=67
+FileChooser.cancelButtonMnemonic=65
 FileChooser.saveButtonText=OK
 FileChooser.saveButtonMnemonic=79
 FileChooser.openButtonText=OK
@@ -67,7 +67,7 @@
 FileChooser.filterLabelText=Filtro:
 FileChooser.pathLabelMnemonic=83
 FileChooser.foldersLabelText=Cartelle
-FileChooser.foldersLabelMnemonic=68
+FileChooser.foldersLabelMnemonic=84
 FileChooser.filesLabelText=File
 FileChooser.filesLabelMnemonic=70

@@ -76,8 +76,9 @@
 FileChooser.openButtonToolTipText=Apre il file selezionato.

 FileChooser.renameFileDialogText=Rinomina file "{0}" in
-FileChooser.renameFileErrorTitle=Errore
+FileChooser.renameFileErrorTitle=Errore
 FileChooser.renameFileErrorText=Errore durante la ridenominazione del file "{0}" in "{1}"

 OptionPane.okButtonMnemonic=79
-OptionPane.cancelButtonMnemonic=67
+OptionPane.cancelButtonMnemonic=65
+
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -6,7 +6,7 @@
 # GTK specific properties

 # GTK color chooser properties:
-GTKColorChooserPanel.nameText=GTK\u30AB\u30E9\u30FC\u30FB\u30C1\u30E5\u30FC\u30B6
+GTKColorChooserPanel.nameText=GTK\u30AB\u30E9\u30FC\u30FB\u30C1\u30E5\u30FC\u30B6(G)
 # 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=\u8272\u76F8:
+GTKColorChooserPanel.hueText=\u8272\u76F8(H):
 GTKColorChooserPanel.hueMnemonic=72

-GTKColorChooserPanel.redText=\u8D64:
+GTKColorChooserPanel.redText=\u8D64(E):
 GTKColorChooserPanel.redMnemonic=69

-GTKColorChooserPanel.saturationText=\u5F69\u5EA6:
+GTKColorChooserPanel.saturationText=\u5F69\u5EA6(S):
 GTKColorChooserPanel.saturationMnemonic=83

-GTKColorChooserPanel.greenText=\u7DD1:
+GTKColorChooserPanel.greenText=\u7DD1(G):
 GTKColorChooserPanel.greenMnemonic=71

-GTKColorChooserPanel.valueText=\u5024:
+GTKColorChooserPanel.valueText=\u5024(V):
 GTKColorChooserPanel.valueMnemonic=86

-GTKColorChooserPanel.blueText=\u9752:
+GTKColorChooserPanel.blueText=\u9752(B):
 GTKColorChooserPanel.blueMnemonic=66

-GTKColorChooserPanel.colorNameText=\u8272\u540D:
+GTKColorChooserPanel.colorNameText=\u8272\u540D(N):
 GTKColorChooserPanel.colorNameMnemonic=78


@@ -46,29 +46,29 @@
 ############ FILE CHOOSER STRINGS #############

 FileChooser.acceptAllFileFilterText=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB
-FileChooser.newFolderButtonText=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
+FileChooser.newFolderButtonText=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0(N)
 FileChooser.newFolderButtonMnemonic=78
 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.deleteFileButtonText=\u30D5\u30A1\u30A4\u30EB\u306E\u524A\u9664(L)
 FileChooser.deleteFileButtonMnemonic=76
-FileChooser.renameFileButtonText=\u30D5\u30A1\u30A4\u30EB\u306E\u540D\u524D\u5909\u66F4
+FileChooser.renameFileButtonText=\u30D5\u30A1\u30A4\u30EB\u306E\u540D\u524D\u5909\u66F4(R)
 FileChooser.renameFileButtonMnemonic=82
-FileChooser.cancelButtonText=\u53D6\u6D88
+FileChooser.cancelButtonText=\u53D6\u6D88(C)
 FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=OK
+FileChooser.saveButtonText=OK(O)
 FileChooser.saveButtonMnemonic=79
-FileChooser.openButtonText=OK
+FileChooser.openButtonText=OK(O)
 FileChooser.openButtonMnemonic=79
 FileChooser.saveDialogTitleText=\u4FDD\u5B58
 FileChooser.openDialogTitleText=\u958B\u304F
-FileChooser.pathLabelText=\u9078\u629E:
+FileChooser.pathLabelText=\u9078\u629E(S):
 FileChooser.filterLabelText=\u30D5\u30A3\u30EB\u30BF:
 FileChooser.pathLabelMnemonic=83
-FileChooser.foldersLabelText=\u30D5\u30A9\u30EB\u30C0
+FileChooser.foldersLabelText=\u30D5\u30A9\u30EB\u30C0(D)
 FileChooser.foldersLabelMnemonic=68
-FileChooser.filesLabelText=\u30D5\u30A1\u30A4\u30EB
+FileChooser.filesLabelText=\u30D5\u30A1\u30A4\u30EB(F)
 FileChooser.filesLabelMnemonic=70

 FileChooser.cancelButtonToolTipText=\u30D5\u30A1\u30A4\u30EB\u30FB\u30C1\u30E5\u30FC\u30B6\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u7D42\u4E86\u3057\u307E\u3059\u3002
@@ -76,8 +76,9 @@
 FileChooser.openButtonToolTipText=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304D\u307E\u3059\u3002

 FileChooser.renameFileDialogText=\u30D5\u30A1\u30A4\u30EB"{0}"\u3092\u6B21\u306E\u540D\u524D\u306B\u5909\u66F4:
-FileChooser.renameFileErrorTitle=\u30A8\u30E9\u30FC
+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	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -6,7 +6,7 @@
 # GTK specific properties

 # GTK color chooser properties:
-GTKColorChooserPanel.nameText=GTK \uC0C9\uC0C1 \uC120\uD0DD\uAE30
+GTKColorChooserPanel.nameText=GTK \uC0C9\uC0C1 \uC120\uD0DD\uAE30(G)
 # 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=\uC0C9\uC870:
+GTKColorChooserPanel.hueText=\uC0C9\uC870(H):
 GTKColorChooserPanel.hueMnemonic=72

-GTKColorChooserPanel.redText=\uBE68\uAC04\uC0C9:
+GTKColorChooserPanel.redText=\uBE68\uAC04\uC0C9(E):
 GTKColorChooserPanel.redMnemonic=69

-GTKColorChooserPanel.saturationText=\uCC44\uB3C4:
+GTKColorChooserPanel.saturationText=\uCC44\uB3C4(S):
 GTKColorChooserPanel.saturationMnemonic=83

-GTKColorChooserPanel.greenText=\uB179\uC0C9:
+GTKColorChooserPanel.greenText=\uB179\uC0C9(G):
 GTKColorChooserPanel.greenMnemonic=71

-GTKColorChooserPanel.valueText=\uAC12:
+GTKColorChooserPanel.valueText=\uAC12(V):
 GTKColorChooserPanel.valueMnemonic=86

-GTKColorChooserPanel.blueText=\uD30C\uB780\uC0C9:
+GTKColorChooserPanel.blueText=\uD30C\uB780\uC0C9(B):
 GTKColorChooserPanel.blueMnemonic=66

-GTKColorChooserPanel.colorNameText=\uC0C9\uC0C1 \uC774\uB984:
+GTKColorChooserPanel.colorNameText=\uC0C9\uC0C1 \uC774\uB984(N):
 GTKColorChooserPanel.colorNameMnemonic=78


@@ -46,29 +46,29 @@
 ############ FILE CHOOSER STRINGS #############

 FileChooser.acceptAllFileFilterText=\uBAA8\uB4E0 \uD30C\uC77C
-FileChooser.newFolderButtonText=\uC0C8 \uD3F4\uB354
+FileChooser.newFolderButtonText=\uC0C8 \uD3F4\uB354(N)
 FileChooser.newFolderButtonMnemonic=78
 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.deleteFileButtonText=\uD30C\uC77C \uC0AD\uC81C(L)
 FileChooser.deleteFileButtonMnemonic=76
-FileChooser.renameFileButtonText=\uD30C\uC77C \uC774\uB984 \uBC14\uAFB8\uAE30
+FileChooser.renameFileButtonText=\uD30C\uC77C \uC774\uB984 \uBC14\uAFB8\uAE30(R)
 FileChooser.renameFileButtonMnemonic=82
-FileChooser.cancelButtonText=\uCDE8\uC18C
+FileChooser.cancelButtonText=\uCDE8\uC18C(C)
 FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=\uD655\uC778
+FileChooser.saveButtonText=\uD655\uC778(O)
 FileChooser.saveButtonMnemonic=79
-FileChooser.openButtonText=\uD655\uC778
+FileChooser.openButtonText=\uD655\uC778(O)
 FileChooser.openButtonMnemonic=79
 FileChooser.saveDialogTitleText=\uC800\uC7A5
 FileChooser.openDialogTitleText=\uC5F4\uAE30
-FileChooser.pathLabelText=\uC120\uD0DD:
+FileChooser.pathLabelText=\uC120\uD0DD \uC0AC\uD56D(S):
 FileChooser.filterLabelText=\uD544\uD130:
 FileChooser.pathLabelMnemonic=83
-FileChooser.foldersLabelText=\uD3F4\uB354
+FileChooser.foldersLabelText=\uD3F4\uB354(D)
 FileChooser.foldersLabelMnemonic=68
-FileChooser.filesLabelText=\uD30C\uC77C
+FileChooser.filesLabelText=\uD30C\uC77C(F)
 FileChooser.filesLabelMnemonic=70

 FileChooser.cancelButtonToolTipText=\uD30C\uC77C \uC120\uD0DD\uAE30 \uB300\uD654\uC0C1\uC790\uB97C \uC911\uB2E8\uD569\uB2C8\uB2E4.
@@ -76,8 +76,9 @@
 FileChooser.openButtonToolTipText=\uC120\uD0DD\uB41C \uD30C\uC77C\uC744 \uC5FD\uB2C8\uB2E4.

 FileChooser.renameFileDialogText="{0}" \uD30C\uC77C\uC758 \uC774\uB984 \uBC14\uAFB8\uAE30
-FileChooser.renameFileErrorTitle=\uC624\uB958
+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	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -21,7 +21,7 @@
 # character of GTKColorChooserPanel.hueText should be underlined to
 # represent the mnemonic.
 GTKColorChooserPanel.hueText=Matiz:
-GTKColorChooserPanel.hueMnemonic=72
+GTKColorChooserPanel.hueMnemonic=77

 GTKColorChooserPanel.redText=Vermelho:
 GTKColorChooserPanel.redMnemonic=69
@@ -30,13 +30,13 @@
 GTKColorChooserPanel.saturationMnemonic=83

 GTKColorChooserPanel.greenText=Verde:
-GTKColorChooserPanel.greenMnemonic=71
+GTKColorChooserPanel.greenMnemonic=86

 GTKColorChooserPanel.valueText=Valor:
 GTKColorChooserPanel.valueMnemonic=86

 GTKColorChooserPanel.blueText=Azul:
-GTKColorChooserPanel.blueMnemonic=66
+GTKColorChooserPanel.blueMnemonic=65

 GTKColorChooserPanel.colorNameText=Nome da Cor:
 GTKColorChooserPanel.colorNameMnemonic=78
@@ -67,17 +67,18 @@
 FileChooser.filterLabelText=Filtro:
 FileChooser.pathLabelMnemonic=83
 FileChooser.foldersLabelText=Pastas
-FileChooser.foldersLabelMnemonic=68
+FileChooser.foldersLabelMnemonic=80
 FileChooser.filesLabelText=Arquivos
-FileChooser.filesLabelMnemonic=70
+FileChooser.filesLabelMnemonic=65

 FileChooser.cancelButtonToolTipText=Abortar caixa de di\u00E1logo do seletor de arquivos.
 FileChooser.saveButtonToolTipText=Salvar arquivo selecionado.
 FileChooser.openButtonToolTipText=Abrir arquivo selecionado.

 FileChooser.renameFileDialogText=Renomear arquivo "{0}" por
-FileChooser.renameFileErrorTitle=Erro
+FileChooser.renameFileErrorTitle=Erro
 FileChooser.renameFileErrorText=Erro ao renomear o arquivo "{0}" por "{1}"

 OptionPane.okButtonMnemonic=79
 OptionPane.cancelButtonMnemonic=67
+
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -21,13 +21,13 @@
 # character of GTKColorChooserPanel.hueText should be underlined to
 # represent the mnemonic.
 GTKColorChooserPanel.hueText=Nyans:
-GTKColorChooserPanel.hueMnemonic=72
+GTKColorChooserPanel.hueMnemonic=78

 GTKColorChooserPanel.redText=R\u00F6d:
-GTKColorChooserPanel.redMnemonic=69
+GTKColorChooserPanel.redMnemonic=82

 GTKColorChooserPanel.saturationText=M\u00E4ttnad:
-GTKColorChooserPanel.saturationMnemonic=83
+GTKColorChooserPanel.saturationMnemonic=77

 GTKColorChooserPanel.greenText=Gr\u00F6n:
 GTKColorChooserPanel.greenMnemonic=71
@@ -38,7 +38,7 @@
 GTKColorChooserPanel.blueText=Bl\u00E5:
 GTKColorChooserPanel.blueMnemonic=66

-GTKColorChooserPanel.colorNameText=F\u00E4rg:
+GTKColorChooserPanel.colorNameText=F\u00E4rgnamn:
 GTKColorChooserPanel.colorNameMnemonic=78


@@ -52,22 +52,22 @@
 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=Namn\u00E4ndra fil
+FileChooser.deleteFileButtonMnemonic=66
+FileChooser.renameFileButtonText=\u00C4ndra namn p\u00E5 filen
 FileChooser.renameFileButtonMnemonic=82
 FileChooser.cancelButtonText=Avbryt
-FileChooser.cancelButtonMnemonic=67
+FileChooser.cancelButtonMnemonic=65
 FileChooser.saveButtonText=OK
 FileChooser.saveButtonMnemonic=79
 FileChooser.openButtonText=OK
 FileChooser.openButtonMnemonic=79
 FileChooser.saveDialogTitleText=Spara
 FileChooser.openDialogTitleText=\u00D6ppna
-FileChooser.pathLabelText=Val:
+FileChooser.pathLabelText=Urval:
 FileChooser.filterLabelText=Filter:
-FileChooser.pathLabelMnemonic=83
+FileChooser.pathLabelMnemonic=85
 FileChooser.foldersLabelText=Mappar
-FileChooser.foldersLabelMnemonic=68
+FileChooser.foldersLabelMnemonic=80
 FileChooser.filesLabelText=Filer
 FileChooser.filesLabelMnemonic=70

@@ -76,8 +76,9 @@
 FileChooser.openButtonToolTipText=\u00D6ppna vald fil.

 FileChooser.renameFileDialogText=Namn\u00E4ndra fil "{0}" till
-FileChooser.renameFileErrorTitle=Fel
+FileChooser.renameFileErrorTitle=Fel
 FileChooser.renameFileErrorText=Fel vid namn\u00E4ndring av fil "{0}" till "{1}"

 OptionPane.okButtonMnemonic=79
-OptionPane.cancelButtonMnemonic=67
+OptionPane.cancelButtonMnemonic=65
+
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -6,7 +6,7 @@
 # GTK specific properties

 # GTK color chooser properties:
-GTKColorChooserPanel.nameText=GTK \u989C\u8272\u9009\u62E9\u5668
+GTKColorChooserPanel.nameText=GTK \u989C\u8272\u9009\u62E9\u5668(G)
 # 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=\u8272\u8C03:
+GTKColorChooserPanel.hueText=\u8272\u8C03(H):
 GTKColorChooserPanel.hueMnemonic=72

-GTKColorChooserPanel.redText=\u7EA2:
+GTKColorChooserPanel.redText=\u7EA2\u8272(E):
 GTKColorChooserPanel.redMnemonic=69

-GTKColorChooserPanel.saturationText=\u9971\u548C\u5EA6:
+GTKColorChooserPanel.saturationText=\u9971\u548C\u5EA6(S):
 GTKColorChooserPanel.saturationMnemonic=83

-GTKColorChooserPanel.greenText=\u7EFF:
+GTKColorChooserPanel.greenText=\u7EFF\u8272(G):
 GTKColorChooserPanel.greenMnemonic=71

-GTKColorChooserPanel.valueText=\u503C:
+GTKColorChooserPanel.valueText=\u503C(V):
 GTKColorChooserPanel.valueMnemonic=86

-GTKColorChooserPanel.blueText=\u84DD:
+GTKColorChooserPanel.blueText=\u84DD\u8272(B):
 GTKColorChooserPanel.blueMnemonic=66

-GTKColorChooserPanel.colorNameText=\u989C\u8272\u540D\u79F0:
+GTKColorChooserPanel.colorNameText=\u989C\u8272\u540D(N):
 GTKColorChooserPanel.colorNameMnemonic=78


@@ -46,29 +46,29 @@
 ############ FILE CHOOSER STRINGS #############

 FileChooser.acceptAllFileFilterText=\u6240\u6709\u6587\u4EF6
-FileChooser.newFolderButtonText=\u65B0\u5EFA\u6587\u4EF6\u5939
+FileChooser.newFolderButtonText=\u65B0\u6587\u4EF6\u5939(N)
 FileChooser.newFolderButtonMnemonic=78
-FileChooser.newFolderDialogText=\u6587\u4EF6\u5939\u540D:
+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.deleteFileButtonText=\u5220\u9664\u6587\u4EF6(L)
 FileChooser.deleteFileButtonMnemonic=76
-FileChooser.renameFileButtonText=\u91CD\u547D\u540D\u6587\u4EF6
+FileChooser.renameFileButtonText=\u91CD\u547D\u540D\u6587\u4EF6(R)
 FileChooser.renameFileButtonMnemonic=82
-FileChooser.cancelButtonText=\u53D6\u6D88
+FileChooser.cancelButtonText=\u53D6\u6D88(C)
 FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=\u786E\u5B9A
+FileChooser.saveButtonText=\u786E\u5B9A(O)
 FileChooser.saveButtonMnemonic=79
-FileChooser.openButtonText=\u786E\u5B9A
+FileChooser.openButtonText=\u786E\u5B9A(O)
 FileChooser.openButtonMnemonic=79
 FileChooser.saveDialogTitleText=\u4FDD\u5B58
 FileChooser.openDialogTitleText=\u6253\u5F00
-FileChooser.pathLabelText=\u9009\u62E9:
-FileChooser.filterLabelText=\u7B5B\u9009\u5668:
+FileChooser.pathLabelText=\u9009\u5B9A\u5185\u5BB9(S):
+FileChooser.filterLabelText=\u7B5B\u9009\u5668:
 FileChooser.pathLabelMnemonic=83
-FileChooser.foldersLabelText=\u6587\u4EF6\u5939
+FileChooser.foldersLabelText=\u6587\u4EF6\u5939(D)
 FileChooser.foldersLabelMnemonic=68
-FileChooser.filesLabelText=\u6587\u4EF6
+FileChooser.filesLabelText=\u6587\u4EF6(F)
 FileChooser.filesLabelMnemonic=70

 FileChooser.cancelButtonToolTipText=\u4E2D\u6B62\u6587\u4EF6\u9009\u62E9\u5668\u5BF9\u8BDD\u6846\u3002
@@ -76,8 +76,9 @@
 FileChooser.openButtonToolTipText=\u6253\u5F00\u6240\u9009\u6587\u4EF6\u3002

 FileChooser.renameFileDialogText=\u5C06\u6587\u4EF6 "{0}" \u91CD\u547D\u540D\u4E3A
-FileChooser.renameFileErrorTitle=\u9519\u8BEF
+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	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -6,7 +6,7 @@
 # GTK specific properties

 # GTK color chooser properties:
-GTKColorChooserPanel.nameText=GTK \u8272\u5F69\u9078\u64C7\u5668
+GTKColorChooserPanel.nameText=GTK \u8272\u5F69\u9078\u64C7\u5668(G)
 # 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=\u8272\u8ABF:
+GTKColorChooserPanel.hueText=\u8272\u8ABF(H)\uFF1A
 GTKColorChooserPanel.hueMnemonic=72

-GTKColorChooserPanel.redText=\u7D05:
+GTKColorChooserPanel.redText=\u7D05(E):
 GTKColorChooserPanel.redMnemonic=69

-GTKColorChooserPanel.saturationText=\u98FD\u548C:
+GTKColorChooserPanel.saturationText=\u5F69\u5EA6(S):
 GTKColorChooserPanel.saturationMnemonic=83

-GTKColorChooserPanel.greenText=\u7DA0:
+GTKColorChooserPanel.greenText=\u7DA0(G):
 GTKColorChooserPanel.greenMnemonic=71

-GTKColorChooserPanel.valueText=\u503C:
+GTKColorChooserPanel.valueText=\u503C(V):
 GTKColorChooserPanel.valueMnemonic=86

-GTKColorChooserPanel.blueText=\u85CD:
+GTKColorChooserPanel.blueText=\u85CD(B):
 GTKColorChooserPanel.blueMnemonic=66

-GTKColorChooserPanel.colorNameText=\u984F\u8272\u540D\u7A31:
+GTKColorChooserPanel.colorNameText=\u984F\u8272\u540D\u7A31(N):
 GTKColorChooserPanel.colorNameMnemonic=78


@@ -46,29 +46,29 @@
 ############ FILE CHOOSER STRINGS #############

 FileChooser.acceptAllFileFilterText=\u6240\u6709\u6A94\u6848
-FileChooser.newFolderButtonText=\u65B0\u8CC7\u6599\u593E
+FileChooser.newFolderButtonText=\u65B0\u5EFA\u8CC7\u6599\u593E(N)
 FileChooser.newFolderButtonMnemonic=78
 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.deleteFileButtonText=\u522A\u9664\u6A94\u6848(L)
 FileChooser.deleteFileButtonMnemonic=76
-FileChooser.renameFileButtonText=\u91CD\u65B0\u547D\u540D\u6A94\u6848
+FileChooser.renameFileButtonText=\u91CD\u65B0\u547D\u540D\u6A94\u6848(R)
 FileChooser.renameFileButtonMnemonic=82
-FileChooser.cancelButtonText=\u53D6\u6D88
+FileChooser.cancelButtonText=\u53D6\u6D88(C)
 FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=\u78BA\u5B9A
+FileChooser.saveButtonText=\u78BA\u5B9A(O)
 FileChooser.saveButtonMnemonic=79
-FileChooser.openButtonText=\u78BA\u5B9A
+FileChooser.openButtonText=\u78BA\u5B9A(O)
 FileChooser.openButtonMnemonic=79
 FileChooser.saveDialogTitleText=\u5132\u5B58
 FileChooser.openDialogTitleText=\u958B\u555F
-FileChooser.pathLabelText=\u9078\u53D6:
+FileChooser.pathLabelText=\u9078\u53D6(S):
 FileChooser.filterLabelText=\u7BE9\u9078:
 FileChooser.pathLabelMnemonic=83
-FileChooser.foldersLabelText=\u8CC7\u6599\u593E
+FileChooser.foldersLabelText=\u8CC7\u6599\u593E(D)
 FileChooser.foldersLabelMnemonic=68
-FileChooser.filesLabelText=\u6A94\u6848
+FileChooser.filesLabelText=\u6A94\u6848(F)
 FileChooser.filesLabelMnemonic=70

 FileChooser.cancelButtonToolTipText=\u4E2D\u6B62\u6A94\u6848\u9078\u64C7\u5668\u5C0D\u8A71\u65B9\u584A\u3002
@@ -76,8 +76,9 @@
 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.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/util/jar/pack/BandStructure.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
--- a/src/share/classes/com/sun/java/util/jar/pack/Driver.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/java/util/jar/pack/Driver.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
--- a/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
--- a/src/share/classes/com/sun/java/util/jar/pack/PropMap.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/java/util/jar/pack/PropMap.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
--- a/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
--- a/src/share/classes/com/sun/java/util/jar/pack/Utils.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/java/util/jar/pack/Utils.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
--- a/src/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
--- a/src/share/classes/com/sun/media/sound/AiffFileWriter.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/media/sound/AiffFileWriter.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
--- a/src/share/classes/com/sun/media/sound/AlawCodec.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/media/sound/AlawCodec.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
--- a/src/share/classes/com/sun/media/sound/AuFileWriter.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/media/sound/AuFileWriter.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
--- a/src/share/classes/com/sun/media/sound/DirectAudioDevice.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/media/sound/DirectAudioDevice.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
--- a/src/share/classes/com/sun/media/sound/RealTimeSequencer.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/media/sound/RealTimeSequencer.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
--- a/src/share/classes/com/sun/media/sound/StandardMidiFileReader.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/media/sound/StandardMidiFileReader.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
--- a/src/share/classes/com/sun/media/sound/SunFileWriter.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/media/sound/SunFileWriter.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
--- a/src/share/classes/com/sun/media/sound/WaveFileWriter.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/media/sound/WaveFileWriter.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
--- a/src/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, 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
--- a/src/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, 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
--- a/src/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, 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
--- a/src/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, 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
--- a/src/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, 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
--- a/src/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, 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
--- a/src/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, 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
--- a/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, 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
--- a/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, 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
--- a/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, 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
--- a/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, 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
--- a/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
--- a/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
--- a/src/share/classes/com/sun/script/util/InterfaceImplementor.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/script/util/InterfaceImplementor.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, 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
--- a/src/share/classes/com/sun/security/auth/PolicyFile.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/security/auth/PolicyFile.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
--- a/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/com/sun/security/auth/login/ConfigFile.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/security/auth/login/ConfigFile.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -6,10 +6,10 @@
 #    FileChooser
 #    OptionPane
 #
-# When this file is read in, the strings are put into the
+# When this file is read in, the strings are put into the
 # defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
 # support.
 #
 #                        MNEMONIC NOTE:
@@ -41,34 +41,34 @@
 # the String, if it does not exist you should add text that makes it
 # exist. This will typically take the form 'XXXX (M)' where M is the
 # character for the mnemonic.
-#
+#
 # @author Steve Wilson

 ############ FILE CHOOSER STRINGS #############
 FileChooser.fileDescriptionText=Allgemeine Datei
 FileChooser.directoryDescriptionText=Verzeichnis
 FileChooser.newFolderErrorText=Fehler beim Erstellen eines neuen Ordners
-FileChooser.newFolderErrorSeparator= :
+FileChooser.newFolderErrorSeparator= :
 FileChooser.newFolderParentDoesntExistTitleText=Ordner kann nicht erstellt werden
 FileChooser.newFolderParentDoesntExistText=Ordner kann nicht erstellt werden.\n\nSystem kann den angegebenen Pfad nicht finden.
 FileChooser.renameErrorTitleText=Fehler beim Umbenennen von Datei oder Ordner
 FileChooser.renameErrorText={0} kann nicht umbenannt werden
-FileChooser.renameErrorFileExistsText={0} kann nicht umbenannt werden: Es ist bereits eine Datei mit dem angegebenen Namen vorhanden. Geben Sie einen anderen Dateinamen an.
+FileChooser.renameErrorFileExistsText={0} kann nicht umbenannt werden: Es ist bereits eine Datei mit dem angegebenen Namen vorhanden. Geben Sie einen anderen Dateinamen an.
 FileChooser.acceptAllFileFilterText=Alle Dateien
 FileChooser.cancelButtonText=Abbrechen
-FileChooser.cancelButtonMnemonic=67
+FileChooser.cancelButtonMnemonic=65
 FileChooser.saveButtonText=Speichern
 FileChooser.saveButtonMnemonic=83
 FileChooser.openButtonText=\u00D6ffnen
-FileChooser.openButtonMnemonic=79
+FileChooser.openButtonMnemonic=70
 FileChooser.saveDialogTitleText=Speichern
 FileChooser.openDialogTitleText=\u00D6ffnen
 FileChooser.updateButtonText=Aktualisieren
-FileChooser.updateButtonMnemonic=85
+FileChooser.updateButtonMnemonic=75
 FileChooser.helpButtonText=Hilfe
 FileChooser.helpButtonMnemonic=72
 FileChooser.directoryOpenButtonText=\u00D6ffnen
-FileChooser.directoryOpenButtonMnemonic=79
+FileChooser.directoryOpenButtonMnemonic=70

 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -96,9 +96,9 @@
 ColorChooser.cancelText=Abbrechen
 ColorChooser.resetText=Zur\u00FCcksetzen
 # VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=82
+ColorChooser.resetMnemonic=90
 ColorChooser.sampleText=Beispieltext  Beispieltext
-ColorChooser.swatchesNameText=Muster
+ColorChooser.swatchesNameText=Swatches
 ColorChooser.swatchesMnemonic=83
 ColorChooser.swatchesRecentText=Aktuell:
 # Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
@@ -120,14 +120,14 @@
 ColorChooser.rgbNameText=RGB
 ColorChooser.rgbMnemonic=71
 ColorChooser.rgbRedText=Rot
-ColorChooser.rgbRedMnemonic=68
+ColorChooser.rgbRedMnemonic=84
 ColorChooser.rgbGreenText=Gr\u00FCn
 ColorChooser.rgbGreenMnemonic=78
 ColorChooser.rgbBlueText=Blau
 ColorChooser.rgbBlueMnemonic=66
 ColorChooser.rgbAlphaText=Alpha
 ColorChooser.rgbHexCodeText=Farbcode
-ColorChooser.rgbHexCodeMnemonic=67
+ColorChooser.rgbHexCodeMnemonic=70
 ColorChooser.cmykNameText=CMYK
 ColorChooser.cmykMnemonic=77
 ColorChooser.cmykCyanText=Zyan
@@ -141,12 +141,12 @@
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
 OptionPane.yesButtonText=Ja
-OptionPane.yesButtonMnemonic=89
+OptionPane.yesButtonMnemonic=74
 OptionPane.noButtonText=Nein
 OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
+OptionPane.okButtonText=OK(0)
 OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=Abbrechen
+OptionPane.cancelButtonText=Abbrechen(0)
 OptionPane.cancelButtonMnemonic=0
 OptionPane.titleText=Option ausw\u00E4hlen
 # Title for the dialog for the showInputDialog methods. Only used if
@@ -168,7 +168,7 @@

 PrintingDialog.contentAbortingText=Druckvorgang wird abgebrochen...

-PrintingDialog.abortButtonText=Abbrechen
+PrintingDialog.abortButtonText=Abbruch
 PrintingDialog.abortButtonMnemonic=65
 PrintingDialog.abortButtonDisplayedMnemonicIndex=0
 PrintingDialog.abortButtonToolTipText=Druckvorgang abbrechen
@@ -223,3 +223,4 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=Als Symbol darstellen
 InternalFrameTitlePane.maximizeButtonAccessibleName=Maximieren
 InternalFrameTitlePane.closeButtonAccessibleName=Schlie\u00DFen
+
--- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -6,10 +6,10 @@
 #    FileChooser
 #    OptionPane
 #
-# When this file is read in, the strings are put into the
+# When this file is read in, the strings are put into the
 # defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
 # support.
 #
 #                        MNEMONIC NOTE:
@@ -41,34 +41,34 @@
 # the String, if it does not exist you should add text that makes it
 # exist. This will typically take the form 'XXXX (M)' where M is the
 # character for the mnemonic.
-#
+#
 # @author Steve Wilson

 ############ FILE CHOOSER STRINGS #############
 FileChooser.fileDescriptionText=Archivo Gen\u00E9rico
 FileChooser.directoryDescriptionText=Directorio
 FileChooser.newFolderErrorText=Error al crear una nueva carpeta
-FileChooser.newFolderErrorSeparator= :
+FileChooser.newFolderErrorSeparator= :
 FileChooser.newFolderParentDoesntExistTitleText=No se ha podido crear la carpeta
 FileChooser.newFolderParentDoesntExistText=No se ha podido crear la carpeta.\n\nEl sistema no puede encontrar la ruta de acceso especificada.
 FileChooser.renameErrorTitleText=Error al cambiar el nombre del archivo o carpeta
 FileChooser.renameErrorText=No se puede cambiar el nombre de {0}
-FileChooser.renameErrorFileExistsText=No se puede cambiar el nombre de {0}: ya existe un archivo con el nombre especificado. Especifique otro nombre de archivo.
+FileChooser.renameErrorFileExistsText=No se puede cambiar el nombre de {0}: ya existe un archivo con el nombre especificado. Especifique otro nombre de archivo.
 FileChooser.acceptAllFileFilterText=Todos los Archivos
 FileChooser.cancelButtonText=Cancelar
 FileChooser.cancelButtonMnemonic=67
 FileChooser.saveButtonText=Guardar
-FileChooser.saveButtonMnemonic=83
+FileChooser.saveButtonMnemonic=71
 FileChooser.openButtonText=Abrir
-FileChooser.openButtonMnemonic=79
+FileChooser.openButtonMnemonic=66
 FileChooser.saveDialogTitleText=Guardar
 FileChooser.openDialogTitleText=Abrir
 FileChooser.updateButtonText=Actualizar
 FileChooser.updateButtonMnemonic=85
 FileChooser.helpButtonText=Ayuda
-FileChooser.helpButtonMnemonic=72
+FileChooser.helpButtonMnemonic=89
 FileChooser.directoryOpenButtonText=Abrir
-FileChooser.directoryOpenButtonMnemonic=79
+FileChooser.directoryOpenButtonMnemonic=65

 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -120,11 +120,11 @@
 ColorChooser.rgbNameText=RGB
 ColorChooser.rgbMnemonic=71
 ColorChooser.rgbRedText=Rojo
-ColorChooser.rgbRedMnemonic=68
+ColorChooser.rgbRedMnemonic=74
 ColorChooser.rgbGreenText=Verde
-ColorChooser.rgbGreenMnemonic=78
+ColorChooser.rgbGreenMnemonic=86
 ColorChooser.rgbBlueText=Azul
-ColorChooser.rgbBlueMnemonic=66
+ColorChooser.rgbBlueMnemonic=90
 ColorChooser.rgbAlphaText=Alfa
 ColorChooser.rgbHexCodeText=C\u00F3digo de Color
 ColorChooser.rgbHexCodeMnemonic=67
@@ -141,12 +141,12 @@
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
 OptionPane.yesButtonText=S\u00ED
-OptionPane.yesButtonMnemonic=89
+OptionPane.yesButtonMnemonic=83
 OptionPane.noButtonText=No
 OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=Aceptar
+OptionPane.okButtonText=OK(0)
 OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=Cancelar
+OptionPane.cancelButtonText=Cancelar (0)
 OptionPane.cancelButtonMnemonic=0
 OptionPane.titleText=Seleccionar una Opci\u00F3n
 # Title for the dialog for the showInputDialog methods. Only used if
@@ -223,3 +223,4 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=Convertir en Icono
 InternalFrameTitlePane.maximizeButtonAccessibleName=Maximizar
 InternalFrameTitlePane.closeButtonAccessibleName=Cerrar
+
--- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -6,10 +6,10 @@
 #    FileChooser
 #    OptionPane
 #
-# When this file is read in, the strings are put into the
+# When this file is read in, the strings are put into the
 # defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
 # support.
 #
 #                        MNEMONIC NOTE:
@@ -41,22 +41,22 @@
 # the String, if it does not exist you should add text that makes it
 # exist. This will typically take the form 'XXXX (M)' where M is the
 # character for the mnemonic.
-#
+#
 # @author Steve Wilson

 ############ FILE CHOOSER STRINGS #############
 FileChooser.fileDescriptionText=Fichier g\u00E9n\u00E9rique
 FileChooser.directoryDescriptionText=R\u00E9pertoire
 FileChooser.newFolderErrorText=Erreur lors de la cr\u00E9ation du dossier
-FileChooser.newFolderErrorSeparator= :
+FileChooser.newFolderErrorSeparator= :
 FileChooser.newFolderParentDoesntExistTitleText=Impossible de cr\u00E9er le dossier
 FileChooser.newFolderParentDoesntExistText=Impossible de cr\u00E9er le dossier.\n\nLe syst\u00E8me ne parvient pas \u00E0 trouver le chemin indiqu\u00E9.
 FileChooser.renameErrorTitleText=Erreur lors du changement de nom du fichier ou du dossier
 FileChooser.renameErrorText=Impossible de renommer {0}
-FileChooser.renameErrorFileExistsText=Impossible de renommer {0} : il existe d\u00E9j\u00E0 un fichier portant le nom indiqu\u00E9. Indiquez-en un autre.
+FileChooser.renameErrorFileExistsText=Impossible de renommer {0} : il existe d\u00E9j\u00E0 un fichier portant le nom indiqu\u00E9. Indiquez-en un autre.
 FileChooser.acceptAllFileFilterText=Tous les fichiers
 FileChooser.cancelButtonText=Annuler
-FileChooser.cancelButtonMnemonic=67
+FileChooser.cancelButtonMnemonic=65
 FileChooser.saveButtonText=Enregistrer
 FileChooser.saveButtonMnemonic=83
 FileChooser.openButtonText=Ouvrir
@@ -66,7 +66,7 @@
 FileChooser.updateButtonText=Mettre \u00E0 jour
 FileChooser.updateButtonMnemonic=85
 FileChooser.helpButtonText=Aide
-FileChooser.helpButtonMnemonic=72
+FileChooser.helpButtonMnemonic=65
 FileChooser.directoryOpenButtonText=Ouvrir
 FileChooser.directoryOpenButtonMnemonic=79

@@ -99,14 +99,14 @@
 ColorChooser.resetMnemonic=82
 ColorChooser.sampleText=Echantillon de texte  Echantillon de texte
 ColorChooser.swatchesNameText=Echantillons
-ColorChooser.swatchesMnemonic=83
+ColorChooser.swatchesMnemonic=69
 ColorChooser.swatchesRecentText=Dernier :
 # Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
 # constant, and an index into the text to render the mnemonic as. The
 # mnemonic is xxxMnemonic and the index of the character to underline is
 # xxxDisplayedMnemonicIndex.
 ColorChooser.hsvNameText=TSV
-ColorChooser.hsvMnemonic=72
+ColorChooser.hsvMnemonic=84
 ColorChooser.hsvHueText=Teinte
 ColorChooser.hsvSaturationText=Saturation
 ColorChooser.hsvValueText=Valeur
@@ -118,17 +118,17 @@
 ColorChooser.hslLightnessText=Lumi\u00E8re
 ColorChooser.hslTransparencyText=Transparence
 ColorChooser.rgbNameText=RVB
-ColorChooser.rgbMnemonic=71
+ColorChooser.rgbMnemonic=86
 ColorChooser.rgbRedText=Rouge
-ColorChooser.rgbRedMnemonic=68
+ColorChooser.rgbRedMnemonic=79
 ColorChooser.rgbGreenText=Vert
-ColorChooser.rgbGreenMnemonic=78
+ColorChooser.rgbGreenMnemonic=86
 ColorChooser.rgbBlueText=Bleu
 ColorChooser.rgbBlueMnemonic=66
 ColorChooser.rgbAlphaText=Alpha
 ColorChooser.rgbHexCodeText=Code couleur
 ColorChooser.rgbHexCodeMnemonic=67
-ColorChooser.cmykNameText=CMJN
+ColorChooser.cmykNameText=CMYK
 ColorChooser.cmykMnemonic=77
 ColorChooser.cmykCyanText=Cyan
 ColorChooser.cmykMagentaText=Magenta
@@ -141,12 +141,12 @@
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
 OptionPane.yesButtonText=Oui
-OptionPane.yesButtonMnemonic=89
+OptionPane.yesButtonMnemonic=79
 OptionPane.noButtonText=Non
 OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
+OptionPane.okButtonText=OK(0)
 OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=Annuler
+OptionPane.cancelButtonText=Annuler (0)
 OptionPane.cancelButtonMnemonic=0
 OptionPane.titleText=S\u00E9lectionner une option
 # Title for the dialog for the showInputDialog methods. Only used if
@@ -223,3 +223,4 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=R\u00E9duire
 InternalFrameTitlePane.maximizeButtonAccessibleName=Agrandir
 InternalFrameTitlePane.closeButtonAccessibleName=Fermer
+
--- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -6,10 +6,10 @@
 #    FileChooser
 #    OptionPane
 #
-# When this file is read in, the strings are put into the
+# When this file is read in, the strings are put into the
 # defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
 # support.
 #
 #                        MNEMONIC NOTE:
@@ -41,34 +41,34 @@
 # the String, if it does not exist you should add text that makes it
 # exist. This will typically take the form 'XXXX (M)' where M is the
 # character for the mnemonic.
-#
+#
 # @author Steve Wilson

 ############ FILE CHOOSER STRINGS #############
 FileChooser.fileDescriptionText=File generico
 FileChooser.directoryDescriptionText=Directory
 FileChooser.newFolderErrorText=Errore durante la creazione della nuova cartella
-FileChooser.newFolderErrorSeparator= :
+FileChooser.newFolderErrorSeparator= :
 FileChooser.newFolderParentDoesntExistTitleText=Impossibile creare la cartella
 FileChooser.newFolderParentDoesntExistText=Impossibile creare la cartella.\n\nIl sistema non \u00E8 in grado di trovare il percorso specificato.
 FileChooser.renameErrorTitleText=Errore durante la ridenominazione del file o della cartella
 FileChooser.renameErrorText=Impossibile rinominare {0}
-FileChooser.renameErrorFileExistsText=Impossibile rinominare {0}: esiste gi\u00E0 un file con il nome specificato. Specificare un altro nome.
+FileChooser.renameErrorFileExistsText=Impossibile rinominare {0}: esiste gi\u00E0 un file con il nome specificato. Specificare un altro nome.
 FileChooser.acceptAllFileFilterText=Tutti i file
 FileChooser.cancelButtonText=Annulla
-FileChooser.cancelButtonMnemonic=67
+FileChooser.cancelButtonMnemonic=65
 FileChooser.saveButtonText=Salva
-FileChooser.saveButtonMnemonic=83
+FileChooser.saveButtonMnemonic=86
 FileChooser.openButtonText=Apri
-FileChooser.openButtonMnemonic=79
+FileChooser.openButtonMnemonic=80
 FileChooser.saveDialogTitleText=Salva
 FileChooser.openDialogTitleText=Apri
 FileChooser.updateButtonText=Aggiorna
-FileChooser.updateButtonMnemonic=85
-FileChooser.helpButtonText=?
+FileChooser.updateButtonMnemonic=71
+FileChooser.helpButtonText=?(H)
 FileChooser.helpButtonMnemonic=72
 FileChooser.directoryOpenButtonText=Apri
-FileChooser.directoryOpenButtonMnemonic=79
+FileChooser.directoryOpenButtonMnemonic=65

 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -99,7 +99,7 @@
 ColorChooser.resetMnemonic=82
 ColorChooser.sampleText=Testo di prova          Testo di prova
 ColorChooser.swatchesNameText=Colori campione
-ColorChooser.swatchesMnemonic=83
+ColorChooser.swatchesMnemonic=80
 ColorChooser.swatchesRecentText=Recenti:
 # Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
 # constant, and an index into the text to render the mnemonic as. The
@@ -120,9 +120,9 @@
 ColorChooser.rgbNameText=RGB
 ColorChooser.rgbMnemonic=71
 ColorChooser.rgbRedText=Rosso
-ColorChooser.rgbRedMnemonic=68
+ColorChooser.rgbRedMnemonic=83
 ColorChooser.rgbGreenText=Verde
-ColorChooser.rgbGreenMnemonic=78
+ColorChooser.rgbGreenMnemonic=68
 ColorChooser.rgbBlueText=Blu
 ColorChooser.rgbBlueMnemonic=66
 ColorChooser.rgbAlphaText=Alfa
@@ -141,13 +141,13 @@
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
 OptionPane.yesButtonText=S\u00EC
-OptionPane.yesButtonMnemonic=89
+OptionPane.yesButtonMnemonic=83
 OptionPane.noButtonText=No
 OptionPane.noButtonMnemonic=78
 OptionPane.okButtonText=OK
-OptionPane.okButtonMnemonic=0
+OptionPane.okButtonMnemonic=O
 OptionPane.cancelButtonText=Annulla
-OptionPane.cancelButtonMnemonic=0
+OptionPane.cancelButtonMnemonic=A
 OptionPane.titleText=Selezionare una opzione
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
@@ -169,7 +169,7 @@
 PrintingDialog.contentAbortingText=Interruzione della stampa...

 PrintingDialog.abortButtonText=Interrompi
-PrintingDialog.abortButtonMnemonic=65
+PrintingDialog.abortButtonMnemonic=78
 PrintingDialog.abortButtonDisplayedMnemonicIndex=0
 PrintingDialog.abortButtonToolTipText=Interrompi la stampa

@@ -223,3 +223,4 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=Riduci a icona
 InternalFrameTitlePane.maximizeButtonAccessibleName=Ingrandisci
 InternalFrameTitlePane.closeButtonAccessibleName=Chiudi
+
--- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -6,10 +6,10 @@
 #    FileChooser
 #    OptionPane
 #
-# When this file is read in, the strings are put into the
+# When this file is read in, the strings are put into the
 # defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
 # support.
 #
 #                        MNEMONIC NOTE:
@@ -41,33 +41,33 @@
 # the String, if it does not exist you should add text that makes it
 # exist. This will typically take the form 'XXXX (M)' where M is the
 # character for the mnemonic.
-#
+#
 # @author Steve Wilson

 ############ FILE CHOOSER STRINGS #############
 FileChooser.fileDescriptionText=\u6C4E\u7528\u30D5\u30A1\u30A4\u30EB
 FileChooser.directoryDescriptionText=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
 FileChooser.newFolderErrorText=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210\u30A8\u30E9\u30FC
-FileChooser.newFolderErrorSeparator= :
+FileChooser.newFolderErrorSeparator= :
 FileChooser.newFolderParentDoesntExistTitleText=\u30D5\u30A9\u30EB\u30C0\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
 FileChooser.newFolderParentDoesntExistText=\u30D5\u30A9\u30EB\u30C0\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3002\n\n\u6307\u5B9A\u3057\u305F\u30D1\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
 FileChooser.renameErrorTitleText=\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30D5\u30A9\u30EB\u30C0\u306E\u540D\u524D\u5909\u66F4\u30A8\u30E9\u30FC
 FileChooser.renameErrorText={0}\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093
-FileChooser.renameErrorFileExistsText={0}\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093: \u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059\u3002\u5225\u306E\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+FileChooser.renameErrorFileExistsText={0}\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093: \u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059\u3002\u5225\u306E\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 FileChooser.acceptAllFileFilterText=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB
-FileChooser.cancelButtonText=\u53D6\u6D88
+FileChooser.cancelButtonText=\u53D6\u6D88(C)
 FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=\u4FDD\u5B58
+FileChooser.saveButtonText=\u4FDD\u5B58(S)
 FileChooser.saveButtonMnemonic=83
-FileChooser.openButtonText=\u958B\u304F
+FileChooser.openButtonText=\u958B\u304F(O)
 FileChooser.openButtonMnemonic=79
 FileChooser.saveDialogTitleText=\u4FDD\u5B58
 FileChooser.openDialogTitleText=\u958B\u304F
-FileChooser.updateButtonText=\u66F4\u65B0
+FileChooser.updateButtonText=\u66F4\u65B0(U)
 FileChooser.updateButtonMnemonic=85
-FileChooser.helpButtonText=\u30D8\u30EB\u30D7
+FileChooser.helpButtonText=\u30D8\u30EB\u30D7(H)
 FileChooser.helpButtonMnemonic=72
-FileChooser.directoryOpenButtonText=\u958B\u304F
+FileChooser.directoryOpenButtonText=\u958B\u304F(O)
 FileChooser.directoryOpenButtonMnemonic=79

 # File Size Units
@@ -94,39 +94,39 @@
 ColorChooser.previewText=\u30D7\u30EC\u30D3\u30E5\u30FC
 ColorChooser.okText=OK
 ColorChooser.cancelText=\u53D6\u6D88
-ColorChooser.resetText=\u30EA\u30BB\u30C3\u30C8
+ColorChooser.resetText=\u30EA\u30BB\u30C3\u30C8(R)
 # VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
 ColorChooser.resetMnemonic=82
 ColorChooser.sampleText=\u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8  \u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8
-ColorChooser.swatchesNameText=\u30B5\u30F3\u30D7\u30EB
+ColorChooser.swatchesNameText=\u30B5\u30F3\u30D7\u30EB(S)
 ColorChooser.swatchesMnemonic=83
 ColorChooser.swatchesRecentText=\u6700\u65B0:
 # Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
 # constant, and an index into the text to render the mnemonic as. The
 # mnemonic is xxxMnemonic and the index of the character to underline is
 # xxxDisplayedMnemonicIndex.
-ColorChooser.hsvNameText=HSV
+ColorChooser.hsvNameText=HSV(H)
 ColorChooser.hsvMnemonic=72
 ColorChooser.hsvHueText=\u8272\u76F8
 ColorChooser.hsvSaturationText=\u5F69\u5EA6
 ColorChooser.hsvValueText=\u5024
 ColorChooser.hsvTransparencyText=\u900F\u660E\u5EA6
-ColorChooser.hslNameText=HSL
+ColorChooser.hslNameText=HSL(L)
 ColorChooser.hslMnemonic=76
 ColorChooser.hslHueText=\u8272\u76F8
 ColorChooser.hslSaturationText=\u5F69\u5EA6
 ColorChooser.hslLightnessText=\u660E\u5EA6
 ColorChooser.hslTransparencyText=\u900F\u660E\u5EA6
-ColorChooser.rgbNameText=RGB
+ColorChooser.rgbNameText=RGB(G)
 ColorChooser.rgbMnemonic=71
-ColorChooser.rgbRedText=\u8D64
+ColorChooser.rgbRedText=\u8D64(D)
 ColorChooser.rgbRedMnemonic=68
-ColorChooser.rgbGreenText=\u7DD1
+ColorChooser.rgbGreenText=\u7DD1(N)
 ColorChooser.rgbGreenMnemonic=78
-ColorChooser.rgbBlueText=\u9752
+ColorChooser.rgbBlueText=\u9752(B)
 ColorChooser.rgbBlueMnemonic=66
 ColorChooser.rgbAlphaText=\u30A2\u30EB\u30D5\u30A1
-ColorChooser.rgbHexCodeText=\u8272\u30B3\u30FC\u30C9
+ColorChooser.rgbHexCodeText=\u8272\u30B3\u30FC\u30C9(C)
 ColorChooser.rgbHexCodeMnemonic=67
 ColorChooser.cmykNameText=CMYK
 ColorChooser.cmykMnemonic=77
@@ -140,13 +140,13 @@
 # Mnemonic keys correspond to KeyEvent.VK_XXX constant
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButtonText=\u306F\u3044
+OptionPane.yesButtonText=\u306F\u3044(Y)
 OptionPane.yesButtonMnemonic=89
-OptionPane.noButtonText=\u3044\u3044\u3048
+OptionPane.noButtonText=\u3044\u3044\u3048(N)
 OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
+OptionPane.okButtonText=OK(0)
 OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=\u53D6\u6D88
+OptionPane.cancelButtonText=\u53D6\u6D88(0)
 OptionPane.cancelButtonMnemonic=0
 OptionPane.titleText=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u9078\u629E
 # Title for the dialog for the showInputDialog methods. Only used if
@@ -168,7 +168,7 @@

 PrintingDialog.contentAbortingText=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059...

-PrintingDialog.abortButtonText=\u4E2D\u6B62
+PrintingDialog.abortButtonText=\u4E2D\u6B62(A)
 PrintingDialog.abortButtonMnemonic=65
 PrintingDialog.abortButtonDisplayedMnemonicIndex=0
 PrintingDialog.abortButtonToolTipText=\u5370\u5237\u306E\u4E2D\u6B62
@@ -223,3 +223,4 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=\u30A2\u30A4\u30B3\u30F3\u5316
 InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316
 InternalFrameTitlePane.closeButtonAccessibleName=\u9589\u3058\u308B
+
--- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -6,10 +6,10 @@
 #    FileChooser
 #    OptionPane
 #
-# When this file is read in, the strings are put into the
+# When this file is read in, the strings are put into the
 # defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
 # support.
 #
 #                        MNEMONIC NOTE:
@@ -41,33 +41,33 @@
 # the String, if it does not exist you should add text that makes it
 # exist. This will typically take the form 'XXXX (M)' where M is the
 # character for the mnemonic.
-#
+#
 # @author Steve Wilson

 ############ FILE CHOOSER STRINGS #############
 FileChooser.fileDescriptionText=\uC77C\uBC18 \uD30C\uC77C
 FileChooser.directoryDescriptionText=\uB514\uB809\uD1A0\uB9AC
 FileChooser.newFolderErrorText=\uC0C8 \uD3F4\uB354\uB97C \uC0DD\uC131\uD558\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
-FileChooser.newFolderErrorSeparator= :
+FileChooser.newFolderErrorSeparator= :
 FileChooser.newFolderParentDoesntExistTitleText=\uD3F4\uB354\uB97C \uC0DD\uC131\uD560 \uC218 \uC5C6\uC74C
 FileChooser.newFolderParentDoesntExistText=\uD3F4\uB354\uB97C \uC0DD\uC131\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.\n\n\uC2DC\uC2A4\uD15C\uC5D0\uC11C \uC9C0\uC815\uB41C \uACBD\uB85C\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
 FileChooser.renameErrorTitleText=\uD30C\uC77C \uB610\uB294 \uD3F4\uB354 \uC774\uB984 \uBC14\uAFB8\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD
 FileChooser.renameErrorText={0}\uC758 \uC774\uB984\uC744 \uBC14\uAFC0 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-FileChooser.renameErrorFileExistsText={0}\uC758 \uC774\uB984\uC744 \uBC14\uAFC0 \uC218 \uC5C6\uC74C: \uC9C0\uC815\uD55C \uC774\uB984\uC744 \uC0AC\uC6A9\uD558\uB294 \uD30C\uC77C\uC774 \uC874\uC7AC\uD569\uB2C8\uB2E4. \uB2E4\uB978 \uD30C\uC77C \uC774\uB984\uC744 \uC9C0\uC815\uD558\uC2ED\uC2DC\uC624.
+FileChooser.renameErrorFileExistsText={0}\uC758 \uC774\uB984\uC744 \uBC14\uAFC0 \uC218 \uC5C6\uC74C: \uC9C0\uC815\uD55C \uC774\uB984\uC744 \uC0AC\uC6A9\uD558\uB294 \uD30C\uC77C\uC774 \uC874\uC7AC\uD569\uB2C8\uB2E4. \uB2E4\uB978 \uD30C\uC77C \uC774\uB984\uC744 \uC9C0\uC815\uD558\uC2ED\uC2DC\uC624.
 FileChooser.acceptAllFileFilterText=\uBAA8\uB4E0 \uD30C\uC77C
-FileChooser.cancelButtonText=\uCDE8\uC18C
+FileChooser.cancelButtonText=\uCDE8\uC18C(C)
 FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=\uC800\uC7A5
+FileChooser.saveButtonText=\uC800\uC7A5(S)
 FileChooser.saveButtonMnemonic=83
-FileChooser.openButtonText=\uC5F4\uAE30
+FileChooser.openButtonText=\uC5F4\uAE30(O)
 FileChooser.openButtonMnemonic=79
 FileChooser.saveDialogTitleText=\uC800\uC7A5
 FileChooser.openDialogTitleText=\uC5F4\uAE30
-FileChooser.updateButtonText=\uAC31\uC2E0
+FileChooser.updateButtonText=\uAC31\uC2E0(U)
 FileChooser.updateButtonMnemonic=85
-FileChooser.helpButtonText=\uB3C4\uC6C0\uB9D0
+FileChooser.helpButtonText=\uB3C4\uC6C0\uB9D0(H)
 FileChooser.helpButtonMnemonic=72
-FileChooser.directoryOpenButtonText=\uC5F4\uAE30
+FileChooser.directoryOpenButtonText=\uC5F4\uAE30(O)
 FileChooser.directoryOpenButtonMnemonic=79

 # File Size Units
@@ -94,39 +94,39 @@
 ColorChooser.previewText=\uBBF8\uB9AC\uBCF4\uAE30
 ColorChooser.okText=\uD655\uC778
 ColorChooser.cancelText=\uCDE8\uC18C
-ColorChooser.resetText=\uC7AC\uC124\uC815
+ColorChooser.resetText=\uC7AC\uC124\uC815(R)
 # VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
 ColorChooser.resetMnemonic=82
 ColorChooser.sampleText=\uC0D8\uD50C \uD14D\uC2A4\uD2B8  \uC0D8\uD50C \uD14D\uC2A4\uD2B8
-ColorChooser.swatchesNameText=\uACAC\uBCF8
+ColorChooser.swatchesNameText=\uACAC\uBCF8(S)
 ColorChooser.swatchesMnemonic=83
 ColorChooser.swatchesRecentText=\uCD5C\uADFC \uBAA9\uB85D:
 # Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
 # constant, and an index into the text to render the mnemonic as. The
 # mnemonic is xxxMnemonic and the index of the character to underline is
 # xxxDisplayedMnemonicIndex.
-ColorChooser.hsvNameText=HSV
+ColorChooser.hsvNameText=HSV(H)
 ColorChooser.hsvMnemonic=72
 ColorChooser.hsvHueText=\uC0C9\uC870
 ColorChooser.hsvSaturationText=\uCC44\uB3C4
 ColorChooser.hsvValueText=\uAC12
 ColorChooser.hsvTransparencyText=\uD22C\uBA85
-ColorChooser.hslNameText=HSL
+ColorChooser.hslNameText=HSL(L)
 ColorChooser.hslMnemonic=76
 ColorChooser.hslHueText=\uC0C9\uC870
 ColorChooser.hslSaturationText=\uCC44\uB3C4
 ColorChooser.hslLightnessText=\uBC1D\uAE30
 ColorChooser.hslTransparencyText=\uD22C\uBA85
-ColorChooser.rgbNameText=RGB
+ColorChooser.rgbNameText=RGB(G)
 ColorChooser.rgbMnemonic=71
-ColorChooser.rgbRedText=\uBE68\uAC04\uC0C9
+ColorChooser.rgbRedText=\uBE68\uAC04\uC0C9(D)
 ColorChooser.rgbRedMnemonic=68
-ColorChooser.rgbGreenText=\uB179\uC0C9
+ColorChooser.rgbGreenText=\uB179\uC0C9(N)
 ColorChooser.rgbGreenMnemonic=78
-ColorChooser.rgbBlueText=\uD30C\uB780\uC0C9
+ColorChooser.rgbBlueText=\uD30C\uB780\uC0C9(B)
 ColorChooser.rgbBlueMnemonic=66
 ColorChooser.rgbAlphaText=\uC54C\uD30C
-ColorChooser.rgbHexCodeText=\uC0C9\uC0C1 \uCF54\uB4DC
+ColorChooser.rgbHexCodeText=\uC0C9\uC0C1 \uCF54\uB4DC(C)
 ColorChooser.rgbHexCodeMnemonic=67
 ColorChooser.cmykNameText=CMYK
 ColorChooser.cmykMnemonic=77
@@ -140,13 +140,13 @@
 # Mnemonic keys correspond to KeyEvent.VK_XXX constant
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButtonText=\uC608
+OptionPane.yesButtonText=\uC608(Y)
 OptionPane.yesButtonMnemonic=89
-OptionPane.noButtonText=\uC544\uB2C8\uC624
+OptionPane.noButtonText=\uC544\uB2C8\uC624(N)
 OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=\uD655\uC778
+OptionPane.okButtonText=OK(0)
 OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=\uCDE8\uC18C
+OptionPane.cancelButtonText=\uCDE8\uC18C(0)
 OptionPane.cancelButtonMnemonic=0
 OptionPane.titleText=\uC635\uC158 \uC120\uD0DD
 # Title for the dialog for the showInputDialog methods. Only used if
@@ -168,7 +168,7 @@

 PrintingDialog.contentAbortingText=\uC778\uC1C4 \uC911\uB2E8 \uC911...

-PrintingDialog.abortButtonText=\uC911\uB2E8
+PrintingDialog.abortButtonText=\uC911\uB2E8(A)
 PrintingDialog.abortButtonMnemonic=65
 PrintingDialog.abortButtonDisplayedMnemonicIndex=0
 PrintingDialog.abortButtonToolTipText=\uC778\uC1C4 \uC911\uB2E8
@@ -223,3 +223,4 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=\uC544\uC774\uCF58\uD654
 InternalFrameTitlePane.maximizeButtonAccessibleName=\uCD5C\uB300\uD654
 InternalFrameTitlePane.closeButtonAccessibleName=\uB2EB\uAE30
+
--- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -6,10 +6,10 @@
 #    FileChooser
 #    OptionPane
 #
-# When this file is read in, the strings are put into the
+# When this file is read in, the strings are put into the
 # defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
 # support.
 #
 #                        MNEMONIC NOTE:
@@ -41,34 +41,34 @@
 # the String, if it does not exist you should add text that makes it
 # exist. This will typically take the form 'XXXX (M)' where M is the
 # character for the mnemonic.
-#
+#
 # @author Steve Wilson

 ############ FILE CHOOSER STRINGS #############
 FileChooser.fileDescriptionText=Arquivo Gen\u00E9rico
 FileChooser.directoryDescriptionText=Diret\u00F3rio
 FileChooser.newFolderErrorText=Erro ao criar nova pasta
-FileChooser.newFolderErrorSeparator= :
+FileChooser.newFolderErrorSeparator= :
 FileChooser.newFolderParentDoesntExistTitleText=N\u00E3o \u00E9 poss\u00EDvel criar a pasta
 FileChooser.newFolderParentDoesntExistText=N\u00E3o \u00E9 poss\u00EDvel criar a pasta.\n\nO sistema n\u00E3o pode localizar o caminho especificado.
 FileChooser.renameErrorTitleText=Erro ao Renomear o Arquivo ou a Pasta
 FileChooser.renameErrorText=N\u00E3o \u00E9 poss\u00EDvel renomear {0}
-FileChooser.renameErrorFileExistsText=N\u00E3o \u00E9 poss\u00EDvel renomear {0}: Um arquivo com o nome especificado j\u00E1 existe. Especifique outro nome de arquivo.
+FileChooser.renameErrorFileExistsText=N\u00E3o \u00E9 poss\u00EDvel renomear {0}: Um arquivo com o nome especificado j\u00E1 existe. Especifique outro nome de arquivo.
 FileChooser.acceptAllFileFilterText=Todos os Arquivos
 FileChooser.cancelButtonText=Cancelar
 FileChooser.cancelButtonMnemonic=67
 FileChooser.saveButtonText=Salvar
 FileChooser.saveButtonMnemonic=83
 FileChooser.openButtonText=Abrir
-FileChooser.openButtonMnemonic=79
+FileChooser.openButtonMnemonic=66
 FileChooser.saveDialogTitleText=Salvar
 FileChooser.openDialogTitleText=Abrir
 FileChooser.updateButtonText=Atualizar
 FileChooser.updateButtonMnemonic=85
 FileChooser.helpButtonText=Ajuda
-FileChooser.helpButtonMnemonic=72
+FileChooser.helpButtonMnemonic=85
 FileChooser.directoryOpenButtonText=Abrir
-FileChooser.directoryOpenButtonMnemonic=79
+FileChooser.directoryOpenButtonMnemonic=66

 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -120,11 +120,11 @@
 ColorChooser.rgbNameText=RGB
 ColorChooser.rgbMnemonic=71
 ColorChooser.rgbRedText=Vermelho
-ColorChooser.rgbRedMnemonic=68
+ColorChooser.rgbRedMnemonic=86
 ColorChooser.rgbGreenText=Verde
-ColorChooser.rgbGreenMnemonic=78
+ColorChooser.rgbGreenMnemonic=86
 ColorChooser.rgbBlueText=Azul
-ColorChooser.rgbBlueMnemonic=66
+ColorChooser.rgbBlueMnemonic=65
 ColorChooser.rgbAlphaText=Alfa
 ColorChooser.rgbHexCodeText=C\u00F3digo da Cor
 ColorChooser.rgbHexCodeMnemonic=67
@@ -141,12 +141,12 @@
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
 OptionPane.yesButtonText=Sim
-OptionPane.yesButtonMnemonic=89
+OptionPane.yesButtonMnemonic=83
 OptionPane.noButtonText=N\u00E3o
 OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
+OptionPane.okButtonText=OK(0)
 OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=Cancelar
+OptionPane.cancelButtonText=Cancelar(0)
 OptionPane.cancelButtonMnemonic=0
 OptionPane.titleText=Selecionar uma Op\u00E7\u00E3o
 # Title for the dialog for the showInputDialog methods. Only used if
@@ -223,3 +223,4 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=Iconify
 InternalFrameTitlePane.maximizeButtonAccessibleName=Maximizar
 InternalFrameTitlePane.closeButtonAccessibleName=Fechar
+
--- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -6,10 +6,10 @@
 #    FileChooser
 #    OptionPane
 #
-# When this file is read in, the strings are put into the
+# When this file is read in, the strings are put into the
 # defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
 # support.
 #
 #                        MNEMONIC NOTE:
@@ -41,34 +41,34 @@
 # the String, if it does not exist you should add text that makes it
 # exist. This will typically take the form 'XXXX (M)' where M is the
 # character for the mnemonic.
-#
+#
 # @author Steve Wilson

 ############ FILE CHOOSER STRINGS #############
 FileChooser.fileDescriptionText=Generisk fil
 FileChooser.directoryDescriptionText=Katalog
 FileChooser.newFolderErrorText=Fel uppstod n\u00E4r ny mapp skapades
-FileChooser.newFolderErrorSeparator= :
+FileChooser.newFolderErrorSeparator= :
 FileChooser.newFolderParentDoesntExistTitleText=Kan inte skapa mappen
 FileChooser.newFolderParentDoesntExistText=Kan inte skapa mappen.\n\nSystemet kan inte hitta angiven s\u00F6kv\u00E4g.
 FileChooser.renameErrorTitleText=Ett fel intr\u00E4ffade vid f\u00F6rs\u00F6k att \u00E4ndra namn p\u00E5 fil eller mapp
 FileChooser.renameErrorText=Kan inte namn\u00E4ndra {0}
-FileChooser.renameErrorFileExistsText=Kan inte namn\u00E4ndra {0}: En fil med angivet namn finns redan. Ange ett annat filnamn.
+FileChooser.renameErrorFileExistsText=Kan inte namn\u00E4ndra {0}: En fil med angivet namn finns redan. Ange ett annat filnamn.
 FileChooser.acceptAllFileFilterText=Alla filer
 FileChooser.cancelButtonText=Avbryt
-FileChooser.cancelButtonMnemonic=67
+FileChooser.cancelButtonMnemonic=65
 FileChooser.saveButtonText=Spara
 FileChooser.saveButtonMnemonic=83
 FileChooser.openButtonText=\u00D6ppna
-FileChooser.openButtonMnemonic=79
+FileChooser.openButtonMnemonic=80
 FileChooser.saveDialogTitleText=Spara
 FileChooser.openDialogTitleText=\u00D6ppna
 FileChooser.updateButtonText=Uppdatera
-FileChooser.updateButtonMnemonic=85
+FileChooser.updateButtonMnemonic=68
 FileChooser.helpButtonText=Hj\u00E4lp
 FileChooser.helpButtonMnemonic=72
 FileChooser.directoryOpenButtonText=\u00D6ppna
-FileChooser.directoryOpenButtonMnemonic=79
+FileChooser.directoryOpenButtonMnemonic=80

 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -99,7 +99,7 @@
 ColorChooser.resetMnemonic=82
 ColorChooser.sampleText=Exempeltext  Exempeltext
 ColorChooser.swatchesNameText=Prov
-ColorChooser.swatchesMnemonic=83
+ColorChooser.swatchesMnemonic=80
 ColorChooser.swatchesRecentText=Senaste:
 # Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
 # constant, and an index into the text to render the mnemonic as. The
@@ -127,7 +127,7 @@
 ColorChooser.rgbBlueMnemonic=66
 ColorChooser.rgbAlphaText=Alfa
 ColorChooser.rgbHexCodeText=F\u00E4rgkod
-ColorChooser.rgbHexCodeMnemonic=67
+ColorChooser.rgbHexCodeMnemonic=70
 ColorChooser.cmykNameText=CMYK
 ColorChooser.cmykMnemonic=77
 ColorChooser.cmykCyanText=Cyan
@@ -141,13 +141,13 @@
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
 OptionPane.yesButtonText=Ja
-OptionPane.yesButtonMnemonic=89
+OptionPane.yesButtonMnemonic=74
 OptionPane.noButtonText=Nej
 OptionPane.noButtonMnemonic=78
 OptionPane.okButtonText=OK
-OptionPane.okButtonMnemonic=0
+OptionPane.okButtonMnemonic=O
 OptionPane.cancelButtonText=Avbryt
-OptionPane.cancelButtonMnemonic=0
+OptionPane.cancelButtonMnemonic=A
 OptionPane.titleText=V\u00E4lj ett alternativ
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
@@ -223,3 +223,4 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=Minimera
 InternalFrameTitlePane.maximizeButtonAccessibleName=Maximera
 InternalFrameTitlePane.closeButtonAccessibleName=St\u00E4ng
+
--- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -6,10 +6,10 @@
 #    FileChooser
 #    OptionPane
 #
-# When this file is read in, the strings are put into the
+# When this file is read in, the strings are put into the
 # defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
 # support.
 #
 #                        MNEMONIC NOTE:
@@ -41,33 +41,33 @@
 # the String, if it does not exist you should add text that makes it
 # exist. This will typically take the form 'XXXX (M)' where M is the
 # character for the mnemonic.
-#
+#
 # @author Steve Wilson

 ############ FILE CHOOSER STRINGS #############
 FileChooser.fileDescriptionText=\u666E\u901A\u7684\u6587\u4EF6
 FileChooser.directoryDescriptionText=\u76EE\u5F55
 FileChooser.newFolderErrorText=\u521B\u5EFA\u65B0\u7684\u6587\u4EF6\u5939\u65F6\u51FA\u9519
-FileChooser.newFolderErrorSeparator= :
+FileChooser.newFolderErrorSeparator= :
 FileChooser.newFolderParentDoesntExistTitleText=\u65E0\u6CD5\u521B\u5EFA\u6587\u4EF6\u5939
 FileChooser.newFolderParentDoesntExistText=\u65E0\u6CD5\u521B\u5EFA\u6587\u4EF6\u5939\u3002\n\n\u7CFB\u7EDF\u627E\u4E0D\u5230\u6307\u5B9A\u7684\u8DEF\u5F84\u3002
 FileChooser.renameErrorTitleText=\u91CD\u547D\u540D\u6587\u4EF6\u6216\u6587\u4EF6\u5939\u65F6\u51FA\u9519
 FileChooser.renameErrorText=\u65E0\u6CD5\u91CD\u547D\u540D{0}
 FileChooser.renameErrorFileExistsText=\u65E0\u6CD5\u91CD\u547D\u540D{0}: \u5DF2\u5B58\u5728\u5177\u6709\u6240\u6307\u5B9A\u540D\u79F0\u7684\u6587\u4EF6\u3002\u8BF7\u6307\u5B9A\u5176\u4ED6\u6587\u4EF6\u540D\u3002
 FileChooser.acceptAllFileFilterText=\u6240\u6709\u6587\u4EF6
-FileChooser.cancelButtonText=\u53D6\u6D88
+FileChooser.cancelButtonText=\u53D6\u6D88(C)
 FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=\u4FDD\u5B58
+FileChooser.saveButtonText=\u4FDD\u5B58(S)
 FileChooser.saveButtonMnemonic=83
-FileChooser.openButtonText=\u6253\u5F00
+FileChooser.openButtonText=\u6253\u5F00(O)
 FileChooser.openButtonMnemonic=79
 FileChooser.saveDialogTitleText=\u4FDD\u5B58
 FileChooser.openDialogTitleText=\u6253\u5F00
-FileChooser.updateButtonText=\u66F4\u65B0
+FileChooser.updateButtonText=\u66F4\u65B0(U)
 FileChooser.updateButtonMnemonic=85
-FileChooser.helpButtonText=\u5E2E\u52A9
+FileChooser.helpButtonText=\u5E2E\u52A9(H)
 FileChooser.helpButtonMnemonic=72
-FileChooser.directoryOpenButtonText=\u6253\u5F00
+FileChooser.directoryOpenButtonText=\u6253\u5F00(O)
 FileChooser.directoryOpenButtonMnemonic=79

 # File Size Units
@@ -94,39 +94,39 @@
 ColorChooser.previewText=\u9884\u89C8
 ColorChooser.okText=\u786E\u5B9A
 ColorChooser.cancelText=\u53D6\u6D88
-ColorChooser.resetText=\u91CD\u8BBE
+ColorChooser.resetText=\u91CD\u7F6E(R)
 # VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
 ColorChooser.resetMnemonic=82
 ColorChooser.sampleText=\u793A\u4F8B\u6587\u672C  \u793A\u4F8B\u6587\u672C
-ColorChooser.swatchesNameText=\u793A\u4F8B
+ColorChooser.swatchesNameText=\u793A\u4F8B(S)
 ColorChooser.swatchesMnemonic=83
 ColorChooser.swatchesRecentText=\u6700\u8FD1:
 # Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
 # constant, and an index into the text to render the mnemonic as. The
 # mnemonic is xxxMnemonic and the index of the character to underline is
 # xxxDisplayedMnemonicIndex.
-ColorChooser.hsvNameText=HSV
+ColorChooser.hsvNameText=HSV(H)
 ColorChooser.hsvMnemonic=72
 ColorChooser.hsvHueText=\u8272\u8C03
 ColorChooser.hsvSaturationText=\u9971\u548C\u5EA6
 ColorChooser.hsvValueText=\u503C
 ColorChooser.hsvTransparencyText=\u900F\u660E\u5EA6
-ColorChooser.hslNameText=HSL
+ColorChooser.hslNameText=HSL(L)
 ColorChooser.hslMnemonic=76
 ColorChooser.hslHueText=\u8272\u8C03
 ColorChooser.hslSaturationText=\u9971\u548C\u5EA6
 ColorChooser.hslLightnessText=\u4EAE\u5EA6
 ColorChooser.hslTransparencyText=\u900F\u660E\u5EA6
-ColorChooser.rgbNameText=RGB
+ColorChooser.rgbNameText=RGB(G)
 ColorChooser.rgbMnemonic=71
-ColorChooser.rgbRedText=\u7EA2
+ColorChooser.rgbRedText=\u7EA2\u8272(D)
 ColorChooser.rgbRedMnemonic=68
-ColorChooser.rgbGreenText=\u7EFF
+ColorChooser.rgbGreenText=\u7EFF\u8272(N)
 ColorChooser.rgbGreenMnemonic=78
-ColorChooser.rgbBlueText=\u84DD
+ColorChooser.rgbBlueText=\u84DD\u8272(B)
 ColorChooser.rgbBlueMnemonic=66
 ColorChooser.rgbAlphaText=Alpha
-ColorChooser.rgbHexCodeText=\u989C\u8272\u4EE3\u7801
+ColorChooser.rgbHexCodeText=\u989C\u8272\u4EE3\u7801(C)
 ColorChooser.rgbHexCodeMnemonic=67
 ColorChooser.cmykNameText=CMYK
 ColorChooser.cmykMnemonic=77
@@ -140,13 +140,13 @@
 # Mnemonic keys correspond to KeyEvent.VK_XXX constant
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButtonText=\u662F
+OptionPane.yesButtonText=\u662F(Y)
 OptionPane.yesButtonMnemonic=89
-OptionPane.noButtonText=\u5426
+OptionPane.noButtonText=\u5426(N)
 OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=\u786E\u5B9A
+OptionPane.okButtonText=OK(0)
 OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=\u53D6\u6D88
+OptionPane.cancelButtonText=\u53D6\u6D88(0)
 OptionPane.cancelButtonMnemonic=0
 OptionPane.titleText=\u9009\u62E9\u4E00\u4E2A\u9009\u9879
 # Title for the dialog for the showInputDialog methods. Only used if
@@ -168,7 +168,7 @@

 PrintingDialog.contentAbortingText=\u6B63\u5728\u4E2D\u6B62\u6253\u5370...

-PrintingDialog.abortButtonText=\u4E2D\u6B62
+PrintingDialog.abortButtonText=\u4E2D\u6B62(A)
 PrintingDialog.abortButtonMnemonic=65
 PrintingDialog.abortButtonDisplayedMnemonicIndex=0
 PrintingDialog.abortButtonToolTipText=\u4E2D\u6B62\u6253\u5370
@@ -217,9 +217,10 @@
 SplitPane.leftButtonText=\u5DE6\u952E
 SplitPane.rightButtonText=\u53F3\u952E
 # Used for Isindex
-IsindexView.prompt=\u8FD9\u662F\u53EF\u641C\u7D22\u7D22\u5F15\u3002\u8BF7\u8F93\u5165\u641C\u7D22\u5173\u952E\u5B57:
+IsindexView.prompt=\u8FD9\u662F\u53EF\u641C\u7D22\u7D22\u5F15\u3002\u8BF7\u8F93\u5165\u641C\u7D22\u5173\u952E\u5B57:

 ############ InternalFrameTitlePane Strings ############
 InternalFrameTitlePane.iconifyButtonAccessibleName=\u56FE\u6807\u5316
 InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316
 InternalFrameTitlePane.closeButtonAccessibleName=\u5173\u95ED
+
--- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -6,10 +6,10 @@
 #    FileChooser
 #    OptionPane
 #
-# When this file is read in, the strings are put into the
+# When this file is read in, the strings are put into the
 # defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
 # support.
 #
 #                        MNEMONIC NOTE:
@@ -41,33 +41,33 @@
 # the String, if it does not exist you should add text that makes it
 # exist. This will typically take the form 'XXXX (M)' where M is the
 # character for the mnemonic.
-#
+#
 # @author Steve Wilson

 ############ FILE CHOOSER STRINGS #############
 FileChooser.fileDescriptionText=\u4E00\u822C\u6A94\u6848
 FileChooser.directoryDescriptionText=\u76EE\u9304
 FileChooser.newFolderErrorText=\u5EFA\u7ACB\u65B0\u8CC7\u6599\u593E\u6642\u767C\u751F\u932F\u8AA4
-FileChooser.newFolderErrorSeparator= :
+FileChooser.newFolderErrorSeparator= :
 FileChooser.newFolderParentDoesntExistTitleText=\u7121\u6CD5\u5EFA\u7ACB\u8CC7\u6599\u593E
 FileChooser.newFolderParentDoesntExistText=\u7121\u6CD5\u5EFA\u7ACB\u8CC7\u6599\u593E\u3002\n\n\u7CFB\u7D71\u627E\u4E0D\u5230\u6307\u5B9A\u7684\u8DEF\u5F91\u3002
 FileChooser.renameErrorTitleText=\u91CD\u65B0\u547D\u540D\u6A94\u6848\u6216\u8CC7\u6599\u593E\u6642\u767C\u751F\u932F\u8AA4\u3002
 FileChooser.renameErrorText=\u7121\u6CD5\u91CD\u65B0\u547D\u540D {0}
 FileChooser.renameErrorFileExistsText=\u7121\u6CD5\u91CD\u65B0\u547D\u540D {0}: \u5DF2\u7D93\u5B58\u5728\u60A8\u6240\u6307\u5B9A\u540D\u7A31\u7684\u6A94\u6848\u3002\u8ACB\u6307\u5B9A\u4E0D\u540C\u7684\u540D\u7A31\u3002
 FileChooser.acceptAllFileFilterText=\u6240\u6709\u6A94\u6848
-FileChooser.cancelButtonText=\u53D6\u6D88
+FileChooser.cancelButtonText=\u53D6\u6D88(C)
 FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=\u5132\u5B58
+FileChooser.saveButtonText=\u5132\u5B58(S)
 FileChooser.saveButtonMnemonic=83
-FileChooser.openButtonText=\u958B\u555F
+FileChooser.openButtonText=\u958B\u555F(O)
 FileChooser.openButtonMnemonic=79
 FileChooser.saveDialogTitleText=\u5132\u5B58
 FileChooser.openDialogTitleText=\u958B\u555F
-FileChooser.updateButtonText=\u66F4\u65B0
+FileChooser.updateButtonText=\u66F4\u65B0(U)
 FileChooser.updateButtonMnemonic=85
-FileChooser.helpButtonText=\u8AAA\u660E
+FileChooser.helpButtonText=\u8AAA\u660E(H)
 FileChooser.helpButtonMnemonic=72
-FileChooser.directoryOpenButtonText=\u958B\u555F
+FileChooser.directoryOpenButtonText=\u958B\u555F(O)
 FileChooser.directoryOpenButtonMnemonic=79

 # File Size Units
@@ -94,39 +94,39 @@
 ColorChooser.previewText=\u9810\u89BD
 ColorChooser.okText=\u78BA\u5B9A
 ColorChooser.cancelText=\u53D6\u6D88
-ColorChooser.resetText=\u91CD\u8A2D
+ColorChooser.resetText=\u91CD\u8A2D(R)
 # VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
 ColorChooser.resetMnemonic=82
 ColorChooser.sampleText=\u7BC4\u4F8B\u6587\u5B57  \u7BC4\u4F8B\u6587\u5B57
-ColorChooser.swatchesNameText=\u8ABF\u8272\u677F
+ColorChooser.swatchesNameText=\u8ABF\u8272\u677F(S)
 ColorChooser.swatchesMnemonic=83
 ColorChooser.swatchesRecentText=\u6700\u65B0\u9078\u64C7:
 # Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
 # constant, and an index into the text to render the mnemonic as. The
 # mnemonic is xxxMnemonic and the index of the character to underline is
 # xxxDisplayedMnemonicIndex.
-ColorChooser.hsvNameText=HSV
+ColorChooser.hsvNameText=HSV(H)
 ColorChooser.hsvMnemonic=72
 ColorChooser.hsvHueText=\u8272\u8ABF
 ColorChooser.hsvSaturationText=\u5F69\u5EA6
 ColorChooser.hsvValueText=\u6578\u503C
 ColorChooser.hsvTransparencyText=\u900F\u660E\u5EA6
-ColorChooser.hslNameText=HSL
+ColorChooser.hslNameText=HSL(L)
 ColorChooser.hslMnemonic=76
 ColorChooser.hslHueText=\u8272\u8ABF
 ColorChooser.hslSaturationText=\u5F69\u5EA6
 ColorChooser.hslLightnessText=\u4EAE\u5EA6
 ColorChooser.hslTransparencyText=\u900F\u660E\u5EA6
-ColorChooser.rgbNameText=RGB
+ColorChooser.rgbNameText=RGB(G)
 ColorChooser.rgbMnemonic=71
-ColorChooser.rgbRedText=\u7D05\u8272
+ColorChooser.rgbRedText=\u7D05(D)
 ColorChooser.rgbRedMnemonic=68
-ColorChooser.rgbGreenText=\u7DA0\u8272
+ColorChooser.rgbGreenText=\u7DA0(N)
 ColorChooser.rgbGreenMnemonic=78
-ColorChooser.rgbBlueText=\u85CD\u8272
+ColorChooser.rgbBlueText=\u85CD(B)
 ColorChooser.rgbBlueMnemonic=66
 ColorChooser.rgbAlphaText=Alpha
-ColorChooser.rgbHexCodeText=\u984F\u8272\u4EE3\u78BC
+ColorChooser.rgbHexCodeText=\u984F\u8272\u4EE3\u78BC(C)
 ColorChooser.rgbHexCodeMnemonic=67
 ColorChooser.cmykNameText=CMYK
 ColorChooser.cmykMnemonic=77
@@ -140,13 +140,13 @@
 # Mnemonic keys correspond to KeyEvent.VK_XXX constant
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButtonText=\u662F
+OptionPane.yesButtonText=\u662F(Y)
 OptionPane.yesButtonMnemonic=89
-OptionPane.noButtonText=\u5426
+OptionPane.noButtonText=\u5426(N)
 OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=\u78BA\u5B9A
+OptionPane.okButtonText=OK(0)
 OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=\u53D6\u6D88
+OptionPane.cancelButtonText=\u53D6\u6D88(0)
 OptionPane.cancelButtonMnemonic=0
 OptionPane.titleText=\u9078\u53D6\u4E00\u500B\u9078\u9805
 # Title for the dialog for the showInputDialog methods. Only used if
@@ -168,7 +168,7 @@

 PrintingDialog.contentAbortingText=\u6B63\u5728\u4E2D\u6B62\u5217\u5370...

-PrintingDialog.abortButtonText=\u4E2D\u6B62
+PrintingDialog.abortButtonText=\u4E2D\u6B62(A)
 PrintingDialog.abortButtonMnemonic=65
 PrintingDialog.abortButtonDisplayedMnemonicIndex=0
 PrintingDialog.abortButtonToolTipText=\u4E2D\u6B62\u5217\u5370
@@ -217,9 +217,10 @@
 SplitPane.leftButtonText=\u5DE6\u6309\u9215
 SplitPane.rightButtonText=\u53F3\u6309\u9215
 # Used for Isindex
-IsindexView.prompt=\u9019\u662F\u4E00\u500B\u53EF\u641C\u5C0B\u7684\u7D22\u5F15\u3002\u8F38\u5165\u641C\u5C0B\u95DC\u9375\u5B57:
+IsindexView.prompt=\u9019\u662F\u4E00\u500B\u53EF\u641C\u5C0B\u7684\u7D22\u5F15\u3002\u8F38\u5165\u641C\u5C0B\u95DC\u9375\u5B57:

 ############ InternalFrameTitlePane Strings ############
 InternalFrameTitlePane.iconifyButtonAccessibleName=\u5716\u793A\u5316
 InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316
 InternalFrameTitlePane.closeButtonAccessibleName=\u95DC\u9589
+
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -4,10 +4,10 @@
 #
 #    FileChooser
 #
-# When this file is read in, the strings are put into the
+# When this file is read in, the strings are put into the
 # defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
 # support.
 #
 # Refer to the note in basic.properties for a description as to what
@@ -47,10 +47,11 @@
 ############ Used by MetalTitlePane if rendering window decorations############
 # All mnemonics are KeyEvent.VK_XXX as integers
 MetalTitlePane.restoreTitle=Wiederherstellen
-MetalTitlePane.restoreMnemonic=82
+MetalTitlePane.restoreMnemonic=87
 MetalTitlePane.iconifyTitle=Minimieren
-MetalTitlePane.iconifyMnemonic=69
+MetalTitlePane.iconifyMnemonic=82
 MetalTitlePane.maximizeTitle=Maximieren
 MetalTitlePane.maximizeMnemonic=88
 MetalTitlePane.closeTitle=Schlie\u00DFen
-MetalTitlePane.closeMnemonic=67
+MetalTitlePane.closeMnemonic=83
+
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -4,10 +4,10 @@
 #
 #    FileChooser
 #
-# When this file is read in, the strings are put into the
+# When this file is read in, the strings are put into the
 # defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
 # support.
 #
 # Refer to the note in basic.properties for a description as to what
@@ -49,8 +49,9 @@
 MetalTitlePane.restoreTitle=Restaurar
 MetalTitlePane.restoreMnemonic=82
 MetalTitlePane.iconifyTitle=Minimizar
-MetalTitlePane.iconifyMnemonic=69
+MetalTitlePane.iconifyMnemonic=90
 MetalTitlePane.maximizeTitle=Maximizar
 MetalTitlePane.maximizeMnemonic=88
 MetalTitlePane.closeTitle=Cerrar
 MetalTitlePane.closeMnemonic=67
+
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -4,10 +4,10 @@
 #
 #    FileChooser
 #
-# When this file is read in, the strings are put into the
+# When this file is read in, the strings are put into the
 # defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
 # support.
 #
 # Refer to the note in basic.properties for a description as to what
@@ -49,8 +49,9 @@
 MetalTitlePane.restoreTitle=Restaurer
 MetalTitlePane.restoreMnemonic=82
 MetalTitlePane.iconifyTitle=R\u00E9duire
-MetalTitlePane.iconifyMnemonic=69
+MetalTitlePane.iconifyMnemonic=68
 MetalTitlePane.maximizeTitle=Agrandir
-MetalTitlePane.maximizeMnemonic=88
+MetalTitlePane.maximizeMnemonic=65
 MetalTitlePane.closeTitle=Fermer
-MetalTitlePane.closeMnemonic=67
+MetalTitlePane.closeMnemonic=70
+
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -4,10 +4,10 @@
 #
 #    FileChooser
 #
-# When this file is read in, the strings are put into the
+# When this file is read in, the strings are put into the
 # defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
 # support.
 #
 # Refer to the note in basic.properties for a description as to what
@@ -49,8 +49,9 @@
 MetalTitlePane.restoreTitle=Ripristina
 MetalTitlePane.restoreMnemonic=82
 MetalTitlePane.iconifyTitle=Riduci a icona
-MetalTitlePane.iconifyMnemonic=69
+MetalTitlePane.iconifyMnemonic=85
 MetalTitlePane.maximizeTitle=Ingrandisci
-MetalTitlePane.maximizeMnemonic=88
+MetalTitlePane.maximizeMnemonic=71
 MetalTitlePane.closeTitle=Chiudi
 MetalTitlePane.closeMnemonic=67
+
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -4,10 +4,10 @@
 #
 #    FileChooser
 #
-# When this file is read in, the strings are put into the
+# When this file is read in, the strings are put into the
 # defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
 # support.
 #
 # Refer to the note in basic.properties for a description as to what
@@ -46,11 +46,12 @@

 ############ Used by MetalTitlePane if rendering window decorations############
 # All mnemonics are KeyEvent.VK_XXX as integers
-MetalTitlePane.restoreTitle=\u5FA9\u5143
+MetalTitlePane.restoreTitle=\u5FA9\u5143(R)
 MetalTitlePane.restoreMnemonic=82
-MetalTitlePane.iconifyTitle=\u6700\u5C0F\u5316
+MetalTitlePane.iconifyTitle=\u6700\u5C0F\u5316(E)
 MetalTitlePane.iconifyMnemonic=69
-MetalTitlePane.maximizeTitle=\u6700\u5927\u5316
+MetalTitlePane.maximizeTitle=\u6700\u5927\u5316(X)
 MetalTitlePane.maximizeMnemonic=88
-MetalTitlePane.closeTitle=\u9589\u3058\u308B
+MetalTitlePane.closeTitle=\u9589\u3058\u308B(C)
 MetalTitlePane.closeMnemonic=67
+
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -4,10 +4,10 @@
 #
 #    FileChooser
 #
-# When this file is read in, the strings are put into the
+# When this file is read in, the strings are put into the
 # defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
 # support.
 #
 # Refer to the note in basic.properties for a description as to what
@@ -46,11 +46,12 @@

 ############ Used by MetalTitlePane if rendering window decorations############
 # All mnemonics are KeyEvent.VK_XXX as integers
-MetalTitlePane.restoreTitle=\uBCF5\uC6D0
+MetalTitlePane.restoreTitle=\uBCF5\uC6D0(R)
 MetalTitlePane.restoreMnemonic=82
-MetalTitlePane.iconifyTitle=\uCD5C\uC18C\uD654
+MetalTitlePane.iconifyTitle=\uCD5C\uC18C\uD654(E)
 MetalTitlePane.iconifyMnemonic=69
-MetalTitlePane.maximizeTitle=\uCD5C\uB300\uD654
+MetalTitlePane.maximizeTitle=\uCD5C\uB300\uD654(X)
 MetalTitlePane.maximizeMnemonic=88
-MetalTitlePane.closeTitle=\uB2EB\uAE30
+MetalTitlePane.closeTitle=\uB2EB\uAE30(C)
 MetalTitlePane.closeMnemonic=67
+
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -4,10 +4,10 @@
 #
 #    FileChooser
 #
-# When this file is read in, the strings are put into the
+# When this file is read in, the strings are put into the
 # defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
 # support.
 #
 # Refer to the note in basic.properties for a description as to what
@@ -49,8 +49,9 @@
 MetalTitlePane.restoreTitle=Restaurar
 MetalTitlePane.restoreMnemonic=82
 MetalTitlePane.iconifyTitle=Minimizar
-MetalTitlePane.iconifyMnemonic=69
+MetalTitlePane.iconifyMnemonic=77
 MetalTitlePane.maximizeTitle=Maximizar
 MetalTitlePane.maximizeMnemonic=88
 MetalTitlePane.closeTitle=Fechar
-MetalTitlePane.closeMnemonic=67
+MetalTitlePane.closeMnemonic=70
+
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -4,10 +4,10 @@
 #
 #    FileChooser
 #
-# When this file is read in, the strings are put into the
+# When this file is read in, the strings are put into the
 # defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
 # support.
 #
 # Refer to the note in basic.properties for a description as to what
@@ -53,4 +53,5 @@
 MetalTitlePane.maximizeTitle=Maximera
 MetalTitlePane.maximizeMnemonic=88
 MetalTitlePane.closeTitle=St\u00E4ng
-MetalTitlePane.closeMnemonic=67
+MetalTitlePane.closeMnemonic=83
+
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -4,10 +4,10 @@
 #
 #    FileChooser
 #
-# When this file is read in, the strings are put into the
+# When this file is read in, the strings are put into the
 # defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
 # support.
 #
 # Refer to the note in basic.properties for a description as to what
@@ -18,11 +18,11 @@

 ############ FILE CHOOSER STRINGS #############

-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.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
@@ -46,11 +46,12 @@

 ############ Used by MetalTitlePane if rendering window decorations############
 # All mnemonics are KeyEvent.VK_XXX as integers
-MetalTitlePane.restoreTitle=\u8FD8\u539F
+MetalTitlePane.restoreTitle=\u8FD8\u539F(R)
 MetalTitlePane.restoreMnemonic=82
-MetalTitlePane.iconifyTitle=\u6700\u5C0F\u5316
+MetalTitlePane.iconifyTitle=\u6700\u5C0F\u5316(E)
 MetalTitlePane.iconifyMnemonic=69
-MetalTitlePane.maximizeTitle=\u6700\u5927\u5316
+MetalTitlePane.maximizeTitle=\u6700\u5927\u5316(X)
 MetalTitlePane.maximizeMnemonic=88
-MetalTitlePane.closeTitle=\u5173\u95ED
+MetalTitlePane.closeTitle=\u5173\u95ED(C)
 MetalTitlePane.closeMnemonic=67
+
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties	Tue Apr 19 16:01:27 2011 -0700
@@ -4,10 +4,10 @@
 #
 #    FileChooser
 #
-# When this file is read in, the strings are put into the
+# When this file is read in, the strings are put into the
 # defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
 # support.
 #
 # Refer to the note in basic.properties for a description as to what
@@ -19,7 +19,7 @@
 ############ FILE CHOOSER STRINGS #############

 FileChooser.lookInLabelText=\u67E5\u8A62:
-FileChooser.saveInLabelText=\u5132\u5B58\u65BC:
+FileChooser.saveInLabelText=\u5132\u5B58\u65BC:
 FileChooser.fileNameLabelText=\u6A94\u6848\u540D\u7A31:
 FileChooser.folderNameLabelText=\u8CC7\u6599\u593E\u540D\u7A31:
 FileChooser.filesOfTypeLabelText=\u6A94\u6848\u985E\u578B:
@@ -46,11 +46,12 @@

 ############ Used by MetalTitlePane if rendering window decorations############
 # All mnemonics are KeyEvent.VK_XXX as integers
-MetalTitlePane.restoreTitle=\u5FA9\u539F
+MetalTitlePane.restoreTitle=\u56DE\u5FA9(R)
 MetalTitlePane.restoreMnemonic=82
-MetalTitlePane.iconifyTitle=\u6700\u5C0F\u5316
+MetalTitlePane.iconifyTitle=\u6700\u5C0F\u5316(E)
 MetalTitlePane.iconifyMnemonic=69
-MetalTitlePane.maximizeTitle=\u6700\u5927\u5316
+MetalTitlePane.maximizeTitle=\u6700\u5927\u5316(X)
 MetalTitlePane.maximizeMnemonic=88
-MetalTitlePane.closeTitle=\u95DC\u9589
+MetalTitlePane.closeTitle=\u95DC\u9589(C)
 MetalTitlePane.closeMnemonic=67
+
--- a/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -185,7 +185,7 @@
         {"Monitor information for expr", "{0} ({1})\u306E\u60C5\u5831\u306E\u30E2\u30CB\u30BF\u30FC:"},
         {"More than one class named", "\u540D\u524D''{0}''\u306E\u30AF\u30E9\u30B9\u304C\u8907\u6570\u3042\u308A\u307E\u3059"},
         {"native method", "native\u30E1\u30BD\u30C3\u30C9"},
-        {"nested:", "\u5165\u308C\u5B50\u306B\u306A\u3063\u3066\u3044\u307E\u3059: {0}"},
+        {"nested:", "\u30CD\u30B9\u30C8\u3055\u308C\u3066\u3044\u307E\u3059: {0}"},
         {"No attach address specified.", "\u63A5\u7D9A\u30A2\u30C9\u30EC\u30B9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
         {"No breakpoints set.", "\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
         {"No class named", "\u540D\u524D''{0}''\u306E\u30AF\u30E9\u30B9\u304C\u3042\u308A\u307E\u305B\u3093"},
--- a/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
--- a/src/share/classes/com/sun/tools/script/shell/init.js	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/com/sun/tools/script/shell/init.js	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
--- a/src/share/classes/java/awt/AWTEvent.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/awt/AWTEvent.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
--- a/src/share/classes/java/awt/Component.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/awt/Component.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 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
--- a/src/share/classes/java/awt/EventQueue.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/awt/EventQueue.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
--- a/src/share/classes/java/awt/Font.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/awt/Font.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 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
--- a/src/share/classes/java/awt/LinearGradientPaint.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/awt/LinearGradientPaint.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
--- a/src/share/classes/java/awt/MenuComponent.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/awt/MenuComponent.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 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
--- a/src/share/classes/java/awt/MultipleGradientPaint.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/awt/MultipleGradientPaint.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
--- a/src/share/classes/java/awt/RadialGradientPaint.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/awt/RadialGradientPaint.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
--- a/src/share/classes/java/awt/TrayIcon.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/awt/TrayIcon.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2009, 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
--- a/src/share/classes/java/awt/Window.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/awt/Window.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 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
--- a/src/share/classes/java/awt/color/ICC_Profile.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/awt/color/ICC_Profile.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/awt/doc-files/AWTThreadIssues.html	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/awt/doc-files/AWTThreadIssues.html	Tue Apr 19 16:01:27 2011 -0700
@@ -115,7 +115,7 @@
 Prior to 1.4, the helper threads were never terminated.
 <p>
 Starting with 1.4, the behavior has changed as a result of the fix for
-<a href="http://developer.java.sun.com/developer/bugParade/bugs/4030718.html">
+<a href="http://bugs.sun.com/view_bug.do?bug_id=4030718">
 4030718</a>. With the current implementation, AWT terminates all its
 helper threads allowing the application to exit cleanly when the
 following three conditions are true:
@@ -148,11 +148,11 @@
 <ul>
   <li> Other packages can create displayable components for internal
        needs and never make them undisplayable. See
-<a href="http://developer.java.sun.com/developer/bugParade/bugs/4515058.html">
+<a href="http://bugs.sun.com/view_bug.do?bug_id=4515058">
 4515058</a>,
-<a href="http://developer.java.sun.com/developer/bugParade/bugs/4671025.html">
+<a href="http://bugs.sun.com/view_bug.do?bug_id=4671025">
 4671025</a>, and
-<a href="http://developer.java.sun.com/developer/bugParade/bugs/4465537.html">
+<a href="http://bugs.sun.com/view_bug.do?bug_id=4465537">
 4465537</a>.
   <li> Both Microsoft Windows and X11 allow an application to send native
        events to windows that belong to another application. With this
--- a/src/share/classes/java/awt/doc-files/FocusSpec.html	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/awt/doc-files/FocusSpec.html	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 <!--
- Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2001, 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
--- a/src/share/classes/java/awt/geom/CubicCurve2D.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/awt/geom/CubicCurve2D.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/awt/image/PackedColorModel.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/awt/image/PackedColorModel.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/awt/image/SinglePixelPackedSampleModel.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/awt/image/SinglePixelPackedSampleModel.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/beans/DefaultPersistenceDelegate.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/beans/DefaultPersistenceDelegate.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/java/beans/DesignMode.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/beans/DesignMode.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/beans/IndexedPropertyChangeEvent.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/beans/IndexedPropertyChangeEvent.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
--- a/src/share/classes/java/beans/Introspector.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/beans/Introspector.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
--- a/src/share/classes/java/beans/VetoableChangeSupport.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/beans/VetoableChangeSupport.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
--- a/src/share/classes/java/beans/package.html	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/beans/package.html	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 <!--
- Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1998, 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
--- a/src/share/classes/java/io/BufferedReader.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/io/BufferedReader.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
--- a/src/share/classes/java/io/BufferedWriter.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/io/BufferedWriter.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
--- a/src/share/classes/java/io/Console.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/io/Console.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, 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
--- a/src/share/classes/java/io/DeleteOnExitHook.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/io/DeleteOnExitHook.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
--- a/src/share/classes/java/io/File.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/io/File.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 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
--- a/src/share/classes/java/io/FileInputStream.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/io/FileInputStream.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 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
--- a/src/share/classes/java/io/FileOutputStream.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/io/FileOutputStream.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 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
--- a/src/share/classes/java/io/FilePermission.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/io/FilePermission.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/io/FilterOutputStream.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/io/FilterOutputStream.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 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
--- a/src/share/classes/java/io/ObjectStreamClass.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/io/ObjectStreamClass.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
--- a/src/share/classes/java/io/PushbackInputStream.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/io/PushbackInputStream.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 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
--- a/src/share/classes/java/io/PushbackReader.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/io/PushbackReader.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
--- a/src/share/classes/java/lang/ApplicationShutdownHooks.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/lang/ApplicationShutdownHooks.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
--- a/src/share/classes/java/lang/Class.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/lang/Class.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 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
--- a/src/share/classes/java/lang/Package.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/lang/Package.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/lang/StackTraceElement.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/lang/StackTraceElement.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/java/lang/StringCoding.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/lang/StringCoding.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/java/lang/System.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/lang/System.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 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
--- a/src/share/classes/java/lang/Thread.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/lang/Thread.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 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
--- a/src/share/classes/java/lang/ThreadGroup.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/lang/ThreadGroup.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 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
--- a/src/share/classes/java/lang/management/ManagementFactory.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/lang/management/ManagementFactory.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
--- a/src/share/classes/java/lang/management/PlatformComponent.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/lang/management/PlatformComponent.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/src/share/classes/java/lang/reflect/Proxy.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/lang/reflect/Proxy.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/src/share/classes/java/lang/reflect/ReflectAccess.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/lang/reflect/ReflectAccess.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2004, 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
--- a/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
--- a/src/share/classes/java/net/AbstractPlainSocketImpl.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/net/AbstractPlainSocketImpl.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 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
--- a/src/share/classes/java/net/HttpURLConnection.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/net/HttpURLConnection.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
--- a/src/share/classes/java/net/InetAddress.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/net/InetAddress.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 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
--- a/src/share/classes/java/net/NetPermission.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/net/NetPermission.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/net/NetworkInterface.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/net/NetworkInterface.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/java/net/URI.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/net/URI.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/java/net/URLClassLoader.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/net/URLClassLoader.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/net/doc-files/net-properties.html	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/net/doc-files/net-properties.html	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 <!--
- Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1998, 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
--- a/src/share/classes/java/net/package.html	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/net/package.html	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 <!--
- Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1998, 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
--- a/src/share/classes/java/nio/channels/AsynchronousFileChannel.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/channels/AsynchronousFileChannel.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/channels/FileChannel.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/channels/FileChannel.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/java/nio/channels/SeekableByteChannel.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/channels/SeekableByteChannel.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/channels/SocketChannel.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/channels/SocketChannel.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/java/nio/file/AccessMode.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/AccessMode.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/CopyOption.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/CopyOption.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/DirectoryIteratorException.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/DirectoryIteratorException.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
--- a/src/share/classes/java/nio/file/DirectoryStream.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/DirectoryStream.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/FileStore.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/FileStore.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/FileSystem.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/FileSystem.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/FileSystems.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/FileSystems.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/FileTreeWalker.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/FileTreeWalker.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/FileVisitor.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/FileVisitor.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/Files.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/Files.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/LinkOption.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/LinkOption.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/LinkPermission.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/LinkPermission.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/OpenOption.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/OpenOption.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/Path.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/Path.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/PathMatcher.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/PathMatcher.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/Paths.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/Paths.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/SecureDirectoryStream.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/SecureDirectoryStream.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/SimpleFileVisitor.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/SimpleFileVisitor.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/TempFileHelper.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/TempFileHelper.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
--- a/src/share/classes/java/nio/file/WatchEvent.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/WatchEvent.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/WatchKey.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/WatchKey.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/WatchService.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/WatchService.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/attribute/AclEntry.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/attribute/AclEntry.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/attribute/AclFileAttributeView.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/attribute/AclFileAttributeView.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/attribute/BasicFileAttributeView.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/attribute/BasicFileAttributeView.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/attribute/BasicFileAttributes.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/attribute/BasicFileAttributes.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/attribute/DosFileAttributeView.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/attribute/DosFileAttributeView.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/attribute/DosFileAttributes.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/attribute/DosFileAttributes.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/attribute/FileAttribute.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/attribute/FileAttribute.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/attribute/FileAttributeView.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/attribute/FileAttributeView.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/attribute/FileTime.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/attribute/FileTime.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
--- a/src/share/classes/java/nio/file/attribute/PosixFileAttributeView.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/attribute/PosixFileAttributeView.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/attribute/PosixFileAttributes.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/attribute/PosixFileAttributes.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/attribute/PosixFilePermission.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/attribute/PosixFilePermission.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/attribute/PosixFilePermissions.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/attribute/PosixFilePermissions.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/attribute/package-info.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/attribute/package-info.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/package-info.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/package-info.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/spi/FileSystemProvider.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/spi/FileSystemProvider.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/nio/file/spi/FileTypeDetector.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/nio/file/spi/FileTypeDetector.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
--- a/src/share/classes/java/security/AccessControlContext.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/AccessControlContext.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/security/AlgorithmParameterGenerator.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/AlgorithmParameterGenerator.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/security/AlgorithmParameters.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/AlgorithmParameters.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/security/BasicPermission.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/BasicPermission.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/security/KeyFactory.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/KeyFactory.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/security/KeyPairGenerator.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/KeyPairGenerator.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/security/KeyStore.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/KeyStore.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/security/MessageDigest.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/MessageDigest.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
--- a/src/share/classes/java/security/Permissions.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/Permissions.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/security/Policy.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/Policy.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/security/ProtectionDomain.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/ProtectionDomain.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/security/Provider.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/Provider.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
--- a/src/share/classes/java/security/SecureClassLoader.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/SecureClassLoader.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/security/SecureRandom.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/SecureRandom.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
--- a/src/share/classes/java/security/Security.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/Security.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
--- a/src/share/classes/java/security/Signature.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/Signature.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
--- a/src/share/classes/java/security/UnresolvedPermission.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/UnresolvedPermission.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/security/UnresolvedPermissionCollection.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/UnresolvedPermissionCollection.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/security/cert/CertPath.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/cert/CertPath.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/java/security/cert/CertPathBuilder.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/cert/CertPathBuilder.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/java/security/cert/CertPathValidator.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/cert/CertPathValidator.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/java/security/cert/CertStore.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/cert/CertStore.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/java/security/cert/Certificate.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/cert/Certificate.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/security/cert/CertificateFactory.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/cert/CertificateFactory.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
--- a/src/share/classes/java/security/cert/CertificateFactorySpi.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/cert/CertificateFactorySpi.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
--- a/src/share/classes/java/security/cert/package.html	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/cert/package.html	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 <!--
- Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1998, 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
--- a/src/share/classes/java/security/package.html	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/security/package.html	Tue Apr 19 16:01:27 2011 -0700
@@ -2,7 +2,7 @@
 <html>
 <head>
 <!--
-Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 1998, 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
--- a/src/share/classes/java/sql/Timestamp.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/sql/Timestamp.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
--- a/src/share/classes/java/text/SimpleDateFormat.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/text/SimpleDateFormat.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
--- a/src/share/classes/java/util/Arrays.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/Arrays.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/util/Collections.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/Collections.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/util/Currency.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/Currency.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/java/util/DualPivotQuicksort.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/DualPivotQuicksort.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
--- a/src/share/classes/java/util/EnumMap.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/EnumMap.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
--- a/src/share/classes/java/util/EnumSet.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/EnumSet.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
--- a/src/share/classes/java/util/HashMap.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/HashMap.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/util/HashSet.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/HashSet.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/util/Hashtable.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/Hashtable.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 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
--- a/src/share/classes/java/util/IdentityHashMap.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/IdentityHashMap.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/java/util/JumboEnumSet.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/JumboEnumSet.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
--- a/src/share/classes/java/util/LinkedHashMap.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/LinkedHashMap.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/java/util/LinkedList.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/LinkedList.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/util/Locale.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/Locale.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
--- a/src/share/classes/java/util/Objects.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/Objects.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
--- a/src/share/classes/java/util/RegularEnumSet.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/RegularEnumSet.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
--- a/src/share/classes/java/util/ServiceLoader.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/ServiceLoader.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
--- a/src/share/classes/java/util/TreeMap.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/TreeMap.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/java/util/UUID.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/UUID.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
--- a/src/share/classes/java/util/Vector.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/Vector.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 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
--- a/src/share/classes/java/util/WeakHashMap.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/WeakHashMap.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2008, 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
--- a/src/share/classes/java/util/concurrent/CopyOnWriteArrayList.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/concurrent/CopyOnWriteArrayList.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
--- a/src/share/classes/java/util/logging/FileHandler.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/logging/FileHandler.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/java/util/logging/Level.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/logging/Level.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/java/util/logging/Logger.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/logging/Logger.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/java/util/logging/Logging.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/logging/Logging.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
--- a/src/share/classes/java/util/prefs/AbstractPreferences.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/prefs/AbstractPreferences.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/java/util/regex/Pattern.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/regex/Pattern.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
--- a/src/share/classes/java/util/spi/LocaleNameProvider.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/spi/LocaleNameProvider.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, 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
--- a/src/share/classes/java/util/zip/Inflater.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/zip/Inflater.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
--- a/src/share/classes/java/util/zip/ZipEntry.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/zip/ZipEntry.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 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
--- a/src/share/classes/java/util/zip/ZipFile.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/zip/ZipFile.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 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
--- a/src/share/classes/java/util/zip/ZipOutputStream.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/zip/ZipOutputStream.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
--- a/src/share/classes/java/util/zip/package.html	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/java/util/zip/package.html	Tue Apr 19 16:01:27 2011 -0700
@@ -2,7 +2,7 @@
 <html>
 <head>
 <!--
-Copyright (c) 1998, 2002, 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
--- a/src/share/classes/javax/crypto/Cipher.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/crypto/Cipher.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/javax/crypto/ExemptionMechanism.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/crypto/ExemptionMechanism.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
--- a/src/share/classes/javax/crypto/KeyAgreement.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/crypto/KeyAgreement.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/javax/crypto/KeyGenerator.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/crypto/KeyGenerator.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/javax/crypto/Mac.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/crypto/Mac.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
--- a/src/share/classes/javax/crypto/package.html	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/crypto/package.html	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 1999, 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
--- a/src/share/classes/javax/net/ssl/SSLContext.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/net/ssl/SSLContext.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
--- a/src/share/classes/javax/net/ssl/package.html	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/net/ssl/package.html	Tue Apr 19 16:01:27 2011 -0700
@@ -2,7 +2,7 @@
 <html>
 <head>
 <!--
-Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 1999, 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
--- a/src/share/classes/javax/print/attribute/standard/DialogTypeSelection.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/print/attribute/standard/DialogTypeSelection.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
--- a/src/share/classes/javax/script/CompiledScript.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/script/CompiledScript.java	Tue Apr 19 16:01:27 2011 -0700
@@ -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
--- a/src/share/classes/javax/script/ScriptEngineFactory.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/script/ScriptEngineFactory.java	Tue Apr 19 16:01:27 2011 -0700
@@ -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
--- a/src/share/classes/javax/security/auth/PrivateCredentialPermission.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/security/auth/PrivateCredentialPermission.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
--- a/src/share/classes/javax/security/auth/SubjectDomainCombiner.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/security/auth/SubjectDomainCombiner.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
--- a/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/javax/security/auth/kerberos/ServicePermission.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/security/auth/kerberos/ServicePermission.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
--- a/src/share/classes/javax/security/auth/login/Configuration.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/security/auth/login/Configuration.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
--- a/src/share/classes/javax/security/auth/login/package.html	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/security/auth/login/package.html	Tue Apr 19 16:01:27 2011 -0700
@@ -2,7 +2,7 @@
 <html>
 <head>
 <!--
-Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2000, 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
--- a/src/share/classes/javax/sound/midi/MidiSystem.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/sound/midi/MidiSystem.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
--- a/src/share/classes/javax/sound/sampled/AudioSystem.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/sound/sampled/AudioSystem.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
--- a/src/share/classes/javax/sql/rowset/package.html	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/sql/rowset/package.html	Tue Apr 19 16:01:27 2011 -0700
@@ -302,7 +302,7 @@

 <h3><a name="reldocs">5.0 Related Documentation</a></h3>
 <ul>
-<li><a href="http://developer.java.sun.com/developer/Books/JDBCTutorial/chapter5.html">
+<li><a href="http://java.sun.com/developer/Books/JDBCTutorial/chapter5.html">
 JDBC RowSet Tutorial</a>
 </ul>
 </body>
--- a/src/share/classes/javax/sql/rowset/serial/SerialClob.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/sql/rowset/serial/SerialClob.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
--- a/src/share/classes/javax/sql/rowset/spi/SyncFactory.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/sql/rowset/spi/SyncFactory.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
--- a/src/share/classes/javax/swing/AbstractButton.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/swing/AbstractButton.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/javax/swing/BorderFactory.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/swing/BorderFactory.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/javax/swing/BufferStrategyPaintManager.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/swing/BufferStrategyPaintManager.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2009, 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
--- a/src/share/classes/javax/swing/DefaultDesktopManager.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/swing/DefaultDesktopManager.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/javax/swing/JComponent.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/swing/JComponent.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/javax/swing/JEditorPane.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/swing/JEditorPane.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/javax/swing/JFileChooser.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/swing/JFileChooser.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/javax/swing/JLayer.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/swing/JLayer.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
--- a/src/share/classes/javax/swing/JOptionPane.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/swing/JOptionPane.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/javax/swing/JSlider.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/swing/JSlider.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/javax/swing/JViewport.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/swing/JViewport.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/javax/swing/LookAndFeel.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/swing/LookAndFeel.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/javax/swing/RepaintManager.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/swing/RepaintManager.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/javax/swing/SizeSequence.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/swing/SizeSequence.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
--- a/src/share/classes/javax/swing/SwingUtilities.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/swing/SwingUtilities.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
--- a/src/share/classes/javax/swing/SwingWorker.java	Fri Apr 15 14:42:09 2011 +0100
+++ b/src/share/classes/javax/swing/SwingWorker.java	Tue Apr 19 16:01:27 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, 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 THI