hg: jdk7u/jdk7u/jdk: 2 new changesets

[michael.fang at oracle.com]

Changeset: cb80eb22fe0a
Author:    mfang
Date:      2012-06-12 13:02 -0700
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/rev/cb80eb22fe0a

7175367: NLS: 7u6 message drop10 integration
Reviewed-by: yhuang

! src/macosx/classes/com/apple/laf/resources/aqua_de.properties
! src/macosx/classes/com/apple/laf/resources/aqua_es.properties
! src/macosx/classes/com/apple/laf/resources/aqua_fr.properties
! src/macosx/classes/com/apple/laf/resources/aqua_it.properties
! src/macosx/classes/com/apple/laf/resources/aqua_ja.properties
! src/macosx/classes/com/apple/laf/resources/aqua_ko.properties
! src/macosx/classes/com/apple/laf/resources/aqua_pt_BR.properties
! src/macosx/classes/com/apple/laf/resources/aqua_sv.properties
! src/macosx/classes/com/apple/laf/resources/aqua_zh_CN.properties
! src/macosx/classes/com/apple/laf/resources/aqua_zh_TW.properties
! src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties
! src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties
! src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties
! src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties
! src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties
! src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties
! src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties
! src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties
! src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties
! src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties
! src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties
! src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties
! src/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties
! src/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties
! src/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties
! src/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties
! src/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties
! src/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties
! src/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties
! src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties
! src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties
! src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties
! src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties
! src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties
! src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties
! src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties
! src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties
! src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties
! src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties
! src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties
! src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties
! src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties
! src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties
! src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties
! src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties
! src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties
! src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties
! src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties
! src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties
! src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties
! src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties
! src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties
! src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties
! src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties
! src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties
! src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.properties
! src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties
! src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties
! src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties
! src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties
! src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties
! src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties
! src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
! src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
! src/share/classes/sun/applet/resources/MsgAppletViewer_ja.java
! src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java
! src/share/classes/sun/applet/resources/MsgAppletViewer_sv.java
! src/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java
! src/share/classes/sun/awt/resources/awt_de.properties
! src/share/classes/sun/awt/resources/awt_es.properties
! src/share/classes/sun/awt/resources/awt_pt_BR.properties
! src/share/classes/sun/awt/resources/awt_zh_CN.properties
! src/share/classes/sun/launcher/resources/launcher_de.properties
! src/share/classes/sun/launcher/resources/launcher_es.properties
! src/share/classes/sun/launcher/resources/launcher_it.properties
! src/share/classes/sun/launcher/resources/launcher_ko.properties
! src/share/classes/sun/launcher/resources/launcher_pt_BR.properties
! src/share/classes/sun/management/resources/agent_de.properties
! src/share/classes/sun/management/resources/agent_es.properties
! src/share/classes/sun/management/resources/agent_fr.properties
! src/share/classes/sun/management/resources/agent_it.properties
! src/share/classes/sun/management/resources/agent_ja.properties
! src/share/classes/sun/management/resources/agent_ko.properties
! src/share/classes/sun/management/resources/agent_pt_BR.properties
! src/share/classes/sun/management/resources/agent_sv.properties
! src/share/classes/sun/management/resources/agent_zh_CN.properties
! src/share/classes/sun/management/resources/agent_zh_TW.properties
! src/share/classes/sun/misc/resources/Messages_de.java
! src/share/classes/sun/misc/resources/Messages_es.java
! src/share/classes/sun/misc/resources/Messages_fr.java
! src/share/classes/sun/misc/resources/Messages_it.java
! src/share/classes/sun/misc/resources/Messages_ja.java
! src/share/classes/sun/misc/resources/Messages_ko.java
! src/share/classes/sun/misc/resources/Messages_pt_BR.java
! src/share/classes/sun/misc/resources/Messages_sv.java
! src/share/classes/sun/misc/resources/Messages_zh_CN.java
! src/share/classes/sun/misc/resources/Messages_zh_TW.java
! src/share/classes/sun/print/resources/serviceui_de.properties
! src/share/classes/sun/print/resources/serviceui_es.properties
! src/share/classes/sun/print/resources/serviceui_fr.properties
! src/share/classes/sun/print/resources/serviceui_it.properties
! src/share/classes/sun/print/resources/serviceui_ja.properties
! src/share/classes/sun/print/resources/serviceui_ko.properties
! src/share/classes/sun/print/resources/serviceui_pt_BR.properties
! src/share/classes/sun/print/resources/serviceui_sv.properties
! src/share/classes/sun/print/resources/serviceui_zh_CN.properties
! src/share/classes/sun/print/resources/serviceui_zh_TW.properties
! src/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties
! src/share/classes/sun/rmi/registry/resources/rmiregistry_es.properties
! src/share/classes/sun/rmi/registry/resources/rmiregistry_fr.properties
! src/share/classes/sun/rmi/registry/resources/rmiregistry_it.properties
! src/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties
! src/share/classes/sun/rmi/registry/resources/rmiregistry_ko.properties
! src/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties
! src/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties
! src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties
! src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties
! src/share/classes/sun/rmi/rmic/resources/rmic_ja.properties
! src/share/classes/sun/rmi/rmic/resources/rmic_zh_CN.properties
! src/share/classes/sun/rmi/server/resources/rmid_de.properties
! src/share/classes/sun/rmi/server/resources/rmid_es.properties
! src/share/classes/sun/rmi/server/resources/rmid_fr.properties
! src/share/classes/sun/rmi/server/resources/rmid_it.properties
! src/share/classes/sun/rmi/server/resources/rmid_ja.properties
! src/share/classes/sun/rmi/server/resources/rmid_ko.properties
! src/share/classes/sun/rmi/server/resources/rmid_pt_BR.properties
! src/share/classes/sun/rmi/server/resources/rmid_sv.properties
! src/share/classes/sun/rmi/server/resources/rmid_zh_CN.properties
! src/share/classes/sun/rmi/server/resources/rmid_zh_TW.properties
! src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java
! src/share/classes/sun/security/util/AuthResources_pt_BR.java
! src/share/classes/sun/security/util/AuthResources_zh_TW.java
! src/share/classes/sun/security/util/Resources_ko.java
! src/share/classes/sun/tools/jar/resources/jar_de.properties
! src/share/classes/sun/tools/jar/resources/jar_es.properties
! src/share/classes/sun/tools/jar/resources/jar_fr.properties
! src/share/classes/sun/tools/jar/resources/jar_it.properties
! src/share/classes/sun/tools/jar/resources/jar_ja.properties
! src/share/classes/sun/tools/jar/resources/jar_ko.properties
! src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties
! src/share/classes/sun/tools/jar/resources/jar_sv.properties
! src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
! src/share/classes/sun/tools/jar/resources/jar_zh_TW.properties
+ src/share/classes/sun/tools/jconsole/resources/messages_ja.properties
+ src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties
! src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_ja.java
! src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_zh_CN.java
! src/share/classes/sun/util/logging/resources/logging_de.properties
! src/share/classes/sun/util/logging/resources/logging_es.properties
! src/share/classes/sun/util/logging/resources/logging_fr.properties
! src/share/classes/sun/util/logging/resources/logging_it.properties
! src/share/classes/sun/util/logging/resources/logging_ja.properties
! src/share/classes/sun/util/logging/resources/logging_ko.properties
! src/share/classes/sun/util/logging/resources/logging_pt_BR.properties
! src/share/classes/sun/util/logging/resources/logging_sv.properties
! src/share/classes/sun/util/logging/resources/logging_zh_CN.properties
! src/share/classes/sun/util/logging/resources/logging_zh_TW.properties
! src/share/classes/sun/util/resources/LocaleNames_de.properties
! src/share/classes/sun/util/resources/LocaleNames_es.properties
! src/share/classes/sun/util/resources/LocaleNames_fr.properties
! src/share/classes/sun/util/resources/LocaleNames_it.properties
! src/share/classes/sun/util/resources/LocaleNames_ja.properties
! src/share/classes/sun/util/resources/LocaleNames_ko.properties
! src/share/classes/sun/util/resources/LocaleNames_pt_BR.properties
! src/share/classes/sun/util/resources/LocaleNames_sv.properties
! src/share/classes/sun/util/resources/LocaleNames_zh.properties
! src/share/classes/sun/util/resources/LocaleNames_zh_TW.properties
! src/share/demo/jfc/Notepad/resources/Notepad_ja.properties
! src/share/demo/jfc/Notepad/resources/Notepad_zh_CN.properties

Changeset: 3ce621d9b988
Author:    mfang
Date:      2012-06-12 16:49 -0700
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/rev/3ce621d9b988

Merge