hg: jdk7u/jdk7u-dev/jdk: 4 new changesets

[michael.fang at sun.com]

Changeset: 13689e97205d
Author:    mfang
Date:      2012-02-14 23:51 -0800
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/rev/13689e97205d

7124171: 7u4 l10n message update related to Mac OS X port
Reviewed-by: psun

! src/macosx/classes/com/apple/laf/resources/aqua.properties
+ 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/sun/launcher/resources/launcher_de.properties
! src/share/classes/sun/launcher/resources/launcher_es.properties
! src/share/classes/sun/launcher/resources/launcher_fr.properties
! src/share/classes/sun/launcher/resources/launcher_it.properties
! src/share/classes/sun/launcher/resources/launcher_ja.properties
! src/share/classes/sun/launcher/resources/launcher_ko.properties
! src/share/classes/sun/launcher/resources/launcher_pt_BR.properties
! src/share/classes/sun/launcher/resources/launcher_sv.properties
! src/share/classes/sun/launcher/resources/launcher_zh_CN.properties
! src/share/classes/sun/launcher/resources/launcher_zh_TW.properties

Changeset: 0f866182a981
Author:    mfang
Date:      2012-02-15 00:15 -0800
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/rev/0f866182a981

7045132: sun.security.util.Resources_pt_BR.java translation error
Reviewed-by: yhuang

! src/share/classes/sun/security/util/Resources_de.java
! src/share/classes/sun/security/util/Resources_es.java
! src/share/classes/sun/security/util/Resources_fr.java
! src/share/classes/sun/security/util/Resources_it.java
! src/share/classes/sun/security/util/Resources_ja.java
! src/share/classes/sun/security/util/Resources_ko.java
! src/share/classes/sun/security/util/Resources_pt_BR.java
! src/share/classes/sun/security/util/Resources_sv.java
! src/share/classes/sun/security/util/Resources_zh_CN.java
! src/share/classes/sun/security/util/Resources_zh_TW.java

Changeset: 5a9df5a77384
Author:    mfang
Date:      2012-02-15 10:27 -0800
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/rev/5a9df5a77384

Merge


Changeset: a152fc3c4c32
Author:    mfang
Date:      2012-02-15 10:40 -0800
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/rev/a152fc3c4c32

Merge

- src/share/classes/com/sun/management/DiagnosticCommandArgumentInfo.java
- src/share/classes/com/sun/management/DiagnosticCommandInfo.java
- test/com/sun/management/HotSpotDiagnosticMXBean/ExecuteDiagnosticCommand.java
- test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticCommandInfo.java
- test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticCommands.java