--- a/jdk/.hgtags Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/.hgtags Mon Apr 11 16:19:20 2011 -0700
@@ -111,3 +111,4 @@
554adcfb615e63e62af530b1c10fcf7813a75b26 jdk7-b134
d8ced728159fbb2caa8b6adb477fd8efdbbdf179 jdk7-b135
aa13e7702cd9d8aca9aa38f1227f966990866944 jdk7-b136
+29296ea6529a418037ccce95903249665ef31c11 jdk7-b137
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties Mon Apr 11 16:19:20 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/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java Mon Apr 11 16:19:20 2011 -0700
@@ -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/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_de.java Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_de.java Mon Apr 11 16:19:20 2011 -0700
@@ -103,7 +103,6 @@
{"appletclassloader.fileexception", "{0}-Ausnahme beim Laden von: {1}"},
{"appletclassloader.filedeath", "{0} abgebrochen beim Laden von: {1}"},
{"appletclassloader.fileerror", "{0}-Fehler beim Laden von: {1}"},
- {"appletclassloader.findclass.verbose.findclass", "{0} Klasse {1} suchen"},
{"appletclassloader.findclass.verbose.openstream", "\u00D6ffnen von Stream zu: {0}, um {1} abzurufen"},
{"appletclassloader.getresource.verbose.forname", "AppletClassLoader.getResource f\u00FCr Name: {0}"},
{"appletclassloader.getresource.verbose.found", "Ressource {0} als Systemressource gefunden"},
--- a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_es.java Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_es.java Mon Apr 11 16:19:20 2011 -0700
@@ -103,7 +103,6 @@
{"appletclassloader.fileexception", "Excepci\u00F3n de {0} al cargar: {1}"},
{"appletclassloader.filedeath", "{0} interrumpido al cargar: {1}"},
{"appletclassloader.fileerror", "error de {0} al cargar: {1}"},
- {"appletclassloader.findclass.verbose.findclass", "{0} encontrar la clase {1}"},
{"appletclassloader.findclass.verbose.openstream", "Abriendo flujo a: {0} para obtener {1}"},
{"appletclassloader.getresource.verbose.forname", "AppletClassLoader.getResource para nombre: {0}"},
{"appletclassloader.getresource.verbose.found", "Recurso encontrado: {0} como un recurso de sistema"},
--- a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_fr.java Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_fr.java Mon Apr 11 16:19:20 2011 -0700
@@ -103,7 +103,6 @@
{"appletclassloader.fileexception", "Exception {0} lors du chargement de : {1}"},
{"appletclassloader.filedeath", "Fermeture de {0} lors du chargement de : {1}"},
{"appletclassloader.fileerror", "Erreur {0} lors du chargement de : {1}"},
- {"appletclassloader.findclass.verbose.findclass", "{0} : recherche de la classe {1}"},
{"appletclassloader.findclass.verbose.openstream", "Ouverture du flux de donn\u00E9es dans {0} pour obtenir {1}"},
{"appletclassloader.getresource.verbose.forname", "AppletClassLoader.getResource pour le nom : {0}"},
{"appletclassloader.getresource.verbose.found", "Ressource {0} trouv\u00E9e en tant que ressource syst\u00E8me"},
--- a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_it.java Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_it.java Mon Apr 11 16:19:20 2011 -0700
@@ -103,7 +103,6 @@
{"appletclassloader.fileexception", "Eccezione {0} durante il caricamento di {1}"},
{"appletclassloader.filedeath", "{0} terminato durante il caricamento di {1}"},
{"appletclassloader.fileerror", "Errore {0} durante il caricamento di {1}"},
- {"appletclassloader.findclass.verbose.findclass", "{0} trova classe {1}"},
{"appletclassloader.findclass.verbose.openstream", "Apertura del flusso per {0} per recuperare {1}"},
{"appletclassloader.getresource.verbose.forname", "AppletClassLoader.getResource per il nome: {0}"},
{"appletclassloader.getresource.verbose.found", "\u00C8 stata trovata la risorsa {0} come risorsa di sistema"},
--- a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_ja.java Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_ja.java Mon Apr 11 16:19:20 2011 -0700
@@ -103,7 +103,6 @@
{"appletclassloader.fileexception", "{1}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B{0}\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
{"appletclassloader.filedeath", "{1}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B{0}\u304C\u5F37\u5236\u7D42\u4E86\u3057\u307E\u3057\u305F"},
{"appletclassloader.fileerror", "{1}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B{0}\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
- {"appletclassloader.findclass.verbose.findclass", "{0}\u306F\u30AF\u30E9\u30B9{1}\u3092\u691C\u51FA\u3057\u307E\u3057\u305F"},
{"appletclassloader.findclass.verbose.openstream", "{1}\u3092\u53D6\u5F97\u3059\u308B\u305F\u3081\u306E{0}\u3078\u306E\u30B9\u30C8\u30EA\u30FC\u30E0\u3092\u958B\u304D\u307E\u3059"},
{"appletclassloader.getresource.verbose.forname", "\u540D\u524D{0}\u306EAppletClassLoader.getResource\u3067\u3059"},
{"appletclassloader.getresource.verbose.found", "\u30EA\u30BD\u30FC\u30B9{0}\u304C\u30B7\u30B9\u30C6\u30E0\u30FB\u30EA\u30BD\u30FC\u30B9\u3068\u3057\u3066\u691C\u51FA\u3055\u308C\u307E\u3057\u305F"},
--- a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_ko.java Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_ko.java Mon Apr 11 16:19:20 2011 -0700
@@ -103,7 +103,6 @@
{"appletclassloader.fileexception", "\uB85C\uB4DC \uC911 {0} \uC608\uC678 \uC0AC\uD56D \uBC1C\uC0DD: {1}"},
{"appletclassloader.filedeath", "\uB85C\uB4DC \uC911 {0}\uC774(\uAC00) \uC885\uB8CC\uB428: {1}"},
{"appletclassloader.fileerror", "\uB85C\uB4DC \uC911 {0} \uC624\uB958 \uBC1C\uC0DD: {1}"},
- {"appletclassloader.findclass.verbose.findclass", "{0}\uC774(\uAC00) {1} \uD074\uB798\uC2A4\uB97C \uCC3E\uC2B5\uB2C8\uB2E4."},
{"appletclassloader.findclass.verbose.openstream", "{1}\uC744(\uB97C) \uAC00\uC838\uC624\uAE30 \uC704\uD574 {0}\uC5D0 \uB300\uD55C \uC2A4\uD2B8\uB9BC\uC744 \uC5EC\uB294 \uC911"},
{"appletclassloader.getresource.verbose.forname", "\uC774\uB984\uC5D0 \uB300\uD55C AppletClassLoader.getResource: {0}"},
{"appletclassloader.getresource.verbose.found", "\uC2DC\uC2A4\uD15C \uB9AC\uC18C\uC2A4\uB85C {0} \uB9AC\uC18C\uC2A4\uB97C \uCC3E\uC558\uC2B5\uB2C8\uB2E4."},
--- a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java Mon Apr 11 16:19:20 2011 -0700
@@ -103,7 +103,6 @@
{"appletclassloader.fileexception", "exce\u00E7\u00E3o de {0} ao carregar: {1}"},
{"appletclassloader.filedeath", "{0} eliminado ao carregar: {1}"},
{"appletclassloader.fileerror", "erro de {0} ao carregar: {1}"},
- {"appletclassloader.findclass.verbose.findclass", "{0} localizar classe {1}"},
{"appletclassloader.findclass.verbose.openstream", "Fluxo de abertura para: {0} para obter {1}"},
{"appletclassloader.getresource.verbose.forname", "AppletClassLoader.getResource do nome: {0}"},
{"appletclassloader.getresource.verbose.found", "Recurso encontrado: {0} como um recurso do sistema"},
--- a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_sv.java Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_sv.java Mon Apr 11 16:19:20 2011 -0700
@@ -73,7 +73,7 @@
{"appletviewer.parse.warning.embed.requiresheight", "Varning: <embed>-taggen kr\u00E4ver ett h\u00F6jdattribut."},
{"appletviewer.parse.warning.embed.requireswidth", "Varning: <embed>-taggen kr\u00E4ver ett breddattribut."},
{"appletviewer.parse.warning.appnotLongersupported", "Varning: <app>-taggen st\u00F6ds inte l\u00E4ngre, anv\u00E4nd <applet> ist\u00E4llet:"},
- {"appletviewer.usage", "Syntax: URL:er f\u00F6r appletviewer-<alternativ>.\n\nF\u00F6ljande <alternativ> finns:\n -debug Startar appletvisning i Java-fels\u00F6kningen\n -encoding <kodning> Anger teckenkodning som anv\u00E4nds i HTML-filer\n -J<k\u00F6rningsflagga> \u00D6verf\u00F6r argument till Java-tolkningen\n\nAlternativet -J \u00E4r inte standard och kan \u00E4ndras utan f\u00F6reg\u00E5ende meddelande."},
+ {"appletviewer.usage", "Syntax: appletviewer <alternativ> url:er \n\nd\u00E4r <alternativ> inkluderar:\n -debug Startar appletvisning i Java-fels\u00F6kningen\n -encoding <kodning> Anger teckenkodning som anv\u00E4nds i HTML-filer\n -J<k\u00F6rningsflagga> \u00D6verf\u00F6r argument till Java-tolkningen\n\nAlternativet -J \u00E4r inte standard och kan \u00E4ndras utan f\u00F6reg\u00E5ende meddelande."},
{"appletviewer.main.err.unsupportedopt", "Alternativ som inte st\u00F6ds: {0}"},
{"appletviewer.main.err.unrecognizedarg", "Ok\u00E4nt argument: {0}"},
{"appletviewer.main.err.dupoption", "Duplicerat alternativ: {0}"},
@@ -103,7 +103,6 @@
{"appletclassloader.fileexception", "{0} undantag vid l\u00E4sning: {1}"},
{"appletclassloader.filedeath", "{0} avslutad vid l\u00E4sning: {1}"},
{"appletclassloader.fileerror", "{0} fel vid l\u00E4sning: {1}"},
- {"appletclassloader.findclass.verbose.findclass", "{0} hittar klass {1}"},
{"appletclassloader.findclass.verbose.openstream", "\u00D6ppnar str\u00F6m till: {0} f\u00F6r h\u00E4mtning av {1}"},
{"appletclassloader.getresource.verbose.forname", "AppletClassLoader.getResource f\u00F6r namnet: {0}"},
{"appletclassloader.getresource.verbose.found", "Hittade resursen: {0} som systemresurs"},
--- a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java Mon Apr 11 16:19:20 2011 -0700
@@ -103,7 +103,6 @@
{"appletclassloader.fileexception", "\u52A0\u8F7D\u65F6\u51FA\u73B0{0}\u5F02\u5E38\u9519\u8BEF: {1}"},
{"appletclassloader.filedeath", "\u52A0\u8F7D\u65F6\u5DF2\u7EC8\u6B62{0}: {1}"},
{"appletclassloader.fileerror", "\u52A0\u8F7D\u65F6\u51FA\u73B0{0}\u9519\u8BEF: {1}"},
- {"appletclassloader.findclass.verbose.findclass", "{0}\u627E\u5230\u7C7B{1}"},
{"appletclassloader.findclass.verbose.openstream", "\u6253\u5F00\u5230{0}\u7684\u6D41\u4EE5\u83B7\u53D6{1}"},
{"appletclassloader.getresource.verbose.forname", "\u540D\u79F0\u7684 AppletClassLoader.getResource: {0}"},
{"appletclassloader.getresource.verbose.found", "\u5DF2\u627E\u5230\u4F5C\u4E3A\u7CFB\u7EDF\u8D44\u6E90\u7684\u8D44\u6E90{0}"},
--- a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java Mon Apr 11 16:19:20 2011 -0700
@@ -103,7 +103,6 @@
{"appletclassloader.fileexception", "\u8F09\u5165\u6642\u767C\u751F {0} \u7570\u5E38\u72C0\u6CC1: {1}"},
{"appletclassloader.filedeath", "\u8F09\u5165\u6642\u522A\u9664 {0}: {1}"},
{"appletclassloader.fileerror", "\u8F09\u5165\u6642\u767C\u751F {0} \u932F\u8AA4: {1}"},
- {"appletclassloader.findclass.verbose.findclass", "{0} \u5C0B\u627E\u985E\u5225 {1}"},
{"appletclassloader.findclass.verbose.openstream", "\u958B\u555F {0} \u7684\u4E32\u6D41\u4EE5\u53D6\u5F97 {1}"},
{"appletclassloader.getresource.verbose.forname", "AppletClassLoader.getResource \u7684\u540D\u7A31: {0}"},
{"appletclassloader.getresource.verbose.found", "\u627E\u5230\u8CC7\u6E90: {0} \u4F5C\u70BA\u7CFB\u7D71\u8CC7\u6E90"},
--- a/jdk/src/share/classes/sun/awt/resources/awt_fr.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/awt/resources/awt_fr.properties Mon Apr 11 16:19:20 2011 -0700
@@ -76,14 +76,14 @@
AWT.help=Aide
AWT.windows=Windows
AWT.context=Menu contextuel
-AWT.backQuote=Apostrophe invers\u00E9e
+AWT.backQuote=Accent grave avec chasse
AWT.quote=Apostrophe
AWT.deadGrave=Accent grave
AWT.deadAcute=Accent aigu
AWT.deadCircumflex=Accent circonflexe
AWT.deadTilde=Tilde
AWT.deadMacron=Macron
-AWT.deadBreve=Demi-cercle
+AWT.deadBreve=Dead Breve
AWT.deadAboveDot=Point en chef
AWT.deadDiaeresis=Tr\u00E9ma
AWT.deadAboveRing=Anneau en chef
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_de.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_de.properties Mon Apr 11 16:19:20 2011 -0700
@@ -24,24 +24,25 @@
#
# Translators please note do not translate the options themselves
-java.launcher.opt.header = Verwendung: {0} [-options] class [args...]\n\ (um eine Klasse auszuf\u00fchren)\n oder {0} [-options] -jar jarfile [args...]\n\ (um eine Jar-Datei auszuf\u00fchren)\nwobei zu den Optionen folgende geh\u00f6ren:\n
+java.launcher.opt.header = Verwendung: {0} [-options] class [args...]\n\ (zur Ausf\u00FChrung einer Klasse)\n oder {0} [-options] -jar jarfile [args...]\n\ (zur Ausf\u00FChrung einer JAR-Datei)\nwobei options Folgendes umfasst:\n
-java.launcher.opt.datamodel =\ -d{0}\t zur Verwendung eines {0}-Bit-Datenmodells, falls verf\u00fcgbar\n
-java.launcher.opt.vmselect =\ {0}\t zur Auswahl von "{1}" VM\n
-java.launcher.opt.hotspot =\ {0}\t ist ein Synonym f\u00fcr "{1}" VM [deprecated]\n
+java.launcher.opt.datamodel =\ -d{0}\t Verwendet ein {0}-Bit-Datenmodell, sofern verf\u00FCgbar\n
+java.launcher.opt.vmselect =\ {0}\t zur Auswahl der "{1}" VM\n
+java.launcher.opt.hotspot =\ {0}\t ist ein Synonym f\u00FCr die "{1}" VM [verworfen]\n
-java.launcher.ergo.message1 =\ Standard-VM ist {0},
-java.launcher.ergo.message2 =\ da Sie auf einem Server-Class-Computer ausf\u00fchren.\n
+java.launcher.ergo.message1 =\ Die Standard-VM ist {0}
+java.launcher.ergo.message2 =\ weil die Ausf\u00FChrung auf einem Server-Class-Rechner erfolgt.\n
# Translators please note do not translate the options themselves
-java.launcher.opt.footer =\ -cp <Pfad zur Klassensuche von Verzeichnissen und Zip-/Jar-Dateien>\n\ -classpath <Pfad zur Klassensuche von Verzeichnissen und Zip-/Jar-Dateien >\n\ A {0} getrennte Liste von Verzeichnissen, JAR-Archiven,\n\ und ZIP-Archiven f\u00fcr die Suche nach Klassendateien .\n\ -D<Name>=<Wert>\n\ Systemeigenschaft festlegen\n\ -verbose[:class|gc|jni]\n\ ausf\u00fchrliche Ausgabe aktivieren\n\ -version Produktversion drucken und beenden\n\ -version:<Wert>\n\ angegebene Version zum Ausf\u00fchren erforderlich \n\ -showversion Produktversion drucken und fortfahren\n\ -jre-restrict-search | -no-jre-restrict-search\n\ private JREs der Benutzer in Versionssuche ein-/ausschlie\u00dfen\n\ -? -help diese Hilfemeldung drucken\n\ -X Hilfe zu nicht standardm\u00e4\u00dfigen Optionen drucken\n\ -ea[:<Paketname>...|:<Klassenname>]\n\ -enableassertions[:<Paketname>...|:<Klassenname>]\n\ Assertions mit spezifizierter Granularit\u00e4t aktivieren\n\ -da[:<Paketname>...|:<Klassenname>]\n\ -disableassertions[:<Paketname>...|:<Klassenname>]\n\ Assertions mit spezifizierter Granularit\u00e4t deaktivieren\n\ -esa | --enablesystemassertions\n\ System-Assertions aktivieren\n\ -dsa | --disablesystemassertions\n\ System-Assertions deaktivieren\n\ -agentlib:<Name der Bibliothek>[=<Optionen>]\n\ systemeigene Agent-Bibliothek laden <Name der Bibliothek>, z.B. -agentlib:hprof\n\ siehe auch, -agentlib:jdwp=help und -agentlib:hprof=help\n\ -agentpath:<Pfadname>[=<Optionen>]\n\ systemeigene Agent-Bibliothek \u00fcber vollst\u00e4ndigen Pfadnamen laden\n\ -javaagent:<Jar-Pfad>[=<Optionen>]\n\ Java Programmierungs-Sprachagenten laden, siehe java.lang.instrument\n\ -splash:<Bildpfad>\n\ Eingangsbildschirm mit spezifiziertem Bild anzeigen\nWeitere Informationen finden Sie unter http://java.sun.com/javase/reference.
+java.launcher.opt.footer =\ -cp <Class-Suchpfad von Verzeichnissen und ZIP-/JAR-Dateien>\n\ -classpath <Class-Suchpfad von Verzeichnissen und ZIP-/JAR-Dateien>\n\ Eine durch {0} getrennte Liste mit Verzeichnissen, JAR-Archiven\n\ und ZIP-Archiven zur Suche nach Klassendateien.\n\ -D<name>=<value>\n\ Setzt eine Systemeigenschaft\n\ -verbose[:class|gc|jni]\n\ Aktiviert die Verbose-Ausgabe\n\ -version Druckt Produktversion und beendet das Programm\n\ -version:<value>\n\ Erfordert die angegebene Version zur Ausf\u00FChrung\n\ -showversion Druckt Produktversion und f\u00E4hrt fort\n\ -jre-restrict-search | -no-jre-restrict-search\n\ Bezieht private JREs des Benutzers in Versionssuche ein bzw. schlie\u00DFt sie aus\n\ -? -help Druckt diese Hilfemeldung\n\ -X Druckt Hilfe zu Nicht-Standardoptionen\n\ -ea[:<packagename>...|:<classname>]\n\ -enableassertions[:<packagename>...|:<classname>]\n\ Aktiviert Assertionen mit angegebener Granularit\u00E4t\n\ -da[:<packagename>...|:<classname>]\n\ -disableassertions[:<packagename>...|:<classname>]\n\ Deaktiviert Assertionen mit angegebener Granularit\u00E4t\n\ -esa | -enablesystemassertions\n\ Aktiviert Systemassertionen\n\ -dsa | -disablesystemassertions\n\ Deaktiviert Systemassertionen\n\ -agentlib:<libname>[=<options>]\n\ L\u00E4dt native Agent Library <libname>, z.B. -agentlib:hprof\n\ siehe auch, -agentlib:jdwp=help und -agentlib:hprof=help\n\ -agentpath:<pathname>[=<options>]\n\ L\u00E4dt native Agent Library nach vollem Pfadnamen\n\ -javaagent:<jarpath>[=<options>]\n\ L\u00E4dt Java-Programmiersprachen-Agent, siehe java.lang.instrument\n\ -splash:<imagepath>\n\ Zeigt Startbildschirm mit angegebenem Bild\nWeitere Einzelheiten finden Sie unter http://java.sun.com/javase/reference.
# Translators please note do not translate the options themselves
-java.launcher.X.usage=\ -Xmixed gemischte Ausf\u00fchrung des Modus (Standard)\n\ -Xint nur interpretierte Ausf\u00fchrung des Modus\n\ -Xbootclasspath:<Verzeichnisse und Zip-/Jar-Dateien, die durch {0} getrennt sind>\n\ Suchpfad f\u00fcr Bootstrap-Klassen und Ressourcen einrichten\n\ -Xbootclasspath/a:<Verzeichnisse und Zip-/Jar-Dateien, die durch {0} getrennt sind>\n\ an das Ende des Bootstrap-Klassenpfads anh\u00e4ngen\n\ -Xbootclasspath/p:<Verzeichnisse und Zip-/Jar-Dateien, die durch {0} getrennt sind>\n\ an den Beginn des Bootstrap-Klassenpfads anh\u00e4ngen\n\ -Xnoclassgc Klassen-Speicherbereinigung deaktivieren\n\ -Xincgc inkrementelle Speicherbereinigung aktivieren\n\ -Xloggc:<Datei> GC-Status f\u00fcr eine Datei mit Zeitstempeln einrichten\n\ -Xbatch Hintergrund-Kompilation deaktivieren\n\ -Xms<Gr\u00f6\u00dfe> anf\u00e4ngliche Java Heap-Gr\u00f6\u00dfe einstellen\n\ -Xmx<Gr\u00f6\u00dfe> maximale Java Heap-Gr\u00f6\u00dfe einstellen\n\ -Xss<Gr\u00f6\u00dfe> Gr\u00f6\u00dfe des Java Thread-Stack einstellen\n\ -Xprof CPU-Profildaten ausgeben\n\ -Xfuture genaueste Pr\u00fcfungen aktivieren und zuk\u00fcnftige Standards absehen\n\ -Xrs Verwendung von OS-Signalen durch Java/VM reduzieren (siehe Dokumentation)\n\ -Xcheck:jni zus\u00e4tzliche Pr\u00fcfungen f\u00fcr JNI- Funktionen ausf\u00fchren\n\ -Xshare:off Nicht versuchen, freigegebene Klassendaten zu verwenden\n\ -Xshare:auto Freigegebene Klassendaten verwenden, wenn m\u00f6glich (Standard)\n\ -Xshare:on Nutzung freigegebener Daten ist erforderlich, ansonsten schl\u00e4gt der Vorgang fehl.\n\nDie -X-Optionen sind kein Standard und k\u00f6nnen \u00c4nderungen unterliegen.\n
+java.launcher.X.usage=\ -Xmixed Ausf\u00FChrung im gemischten Modus (Standard)\n\ -Xint Nur Ausf\u00FChrung im interpretierten Modus\n\ -Xbootclasspath:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n\ Legt Suchpfad f\u00FCr Bootstrap-Klassen und Ressourcen fest\n\ -Xbootclasspath/a:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n\ H\u00E4ngt an das Ende des Bootstrap Classpath an\n\ -Xbootclasspath/p:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n\ Stellt Bootstrap Classpath voran\n\ -Xdiag Zeigt zus\u00E4tzliche Diagnosemeldungen an\n\ -Xnoclassgc Deaktiviert Klassen-Garbage Collection\n\ -Xincgc Aktiviert inkrementelle Garbage Collection\n\ -Xloggc:<file> Loggt GC-Status in einer Datei mit Zeitstempeln\n\ -Xbatch Deaktiviert Hintergrundkompilierung\n\ -Xms<size> Legt anf\u00E4ngliche Java Heap-Gr\u00F6\u00DFe fest\n\ -Xmx<size> Legt maximale Java Heap-Gr\u00F6\u00DFe fest\n\ -Xss<size> Legt Java-Thread-Stack-Gr\u00F6\u00DFe fest\n\ -Xprof Gibt CPU-Profiling-Daten aus\n\ -Xfuture Aktiviert strengste Pr\u00FCfungen, antizipiert zuk\u00FCnftigen Standardwert\n\ -Xrs Reduziert Verwendung von BS-Signalen durch Java/VM (siehe Dokumentation)\n\ -Xcheck:jni F\u00FChrt zus\u00E4tzliche Pr\u00FCfungen f\u00FCr JNI-Funktionen durch\n\ -Xshare:off Kein Versuch, gemeinsame Klassendaten zu verwenden\n\ -Xshare:auto Verwendet gemeinsame Klassendaten, wenn m\u00F6glich (Standard)\n\ -Xshare:on Erfordert die Verwendung gemeinsamer Klassendaten, sonst verl\u00E4uft der Vorgang nicht erfolgreich.\n\ -XshowSettings Zeigt alle Einstellungen und f\u00E4hrt fort\n\ -XshowSettings:all\n\ Zeigt alle Einstellungen und f\u00E4hrt fort\n\ -XshowSettings:vm Zeigt alle VM-bezogenen Einstellungen und f\u00E4hrt fort\n\ -XshowSettings:properties\n\ Zeigt alle Eigenschaftseinstellungen und f\u00E4hrt fort\n\ -XshowSettings:locale\n\ Zeigt alle gebietsschemabezogenen Einstellungen und f\u00E4hrt fort\n\nDie -X-Optionen sind keine Standardoptionen und k\u00F6nnen ohne Vorank\u00FCndigung ge\u00E4ndert werden.\n
-java.launcher.cls.error1=Fehler: Hauptklasse {0} wurde nicht gefunden
-java.launcher.cls.error2=Fehler: Hauptmethode in Klasse {1} ist nicht {0}. Definieren Sie die folgende Hauptmethode:\n\ public static void main(String[] args)
-java.launcher.cls.error3=Fehler: Hauptmethode muss einen Wert des Typs void in Klasse {0} anzeigen.\nDefinieren Sie die folgende Hauptmethode:\n\ public static void main(String[] args)
-java.launcher.cls.error4=Fehler: Hauptmethode in Klasse {0} nicht gefunden. Definieren Sie die folgende Hauptmethode:\n\ public static void main(String[] args)
-
-
+java.launcher.cls.error1=Fehler: Hauptklasse {0} konnte nicht gefunden oder geladen werden
+java.launcher.cls.error2=Fehler: Hauptmethode ist nicht {0} in Klasse {1}. Definieren Sie die Hauptmethode als:\n\ public static void main(String[] args)
+java.launcher.cls.error3=Fehler: Hauptmethode muss einen Wert vom Typ void in Klasse {0} zur\u00FCckgeben. Definieren Sie \ndie Hauptmethode als:\n\ public static void main(String[] args)
+java.launcher.cls.error4=Fehler: Hauptmethode in Klasse {0} nicht gefunden. Definieren Sie die Hauptmethode als:\n\ public static void main(String[] args)
+java.launcher.jar.error1=Fehler: Beim Versuch, Datei {0} zu \u00F6ffnen, ist ein unerwarteter Fehler aufgetreten
+java.launcher.jar.error2=Manifest in {0} nicht gefunden
+java.launcher.jar.error3=kein Hauptmanifestattribut, in {0}
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_es.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_es.properties Mon Apr 11 16:19:20 2011 -0700
@@ -24,24 +24,25 @@
#
# Translators please note do not translate the options themselves
-java.launcher.opt.header = Uso: {0} [-options] class [args...]\n\ (para ejecutar una clase)\n o {0} [-options] -jar jarfile [args...]\n\ (para ejecutar un archivo jar)\nlas opciones pueden ser:\n
+java.launcher.opt.header = Sintaxis: {0} [-options] class [args...]\n\ (para ejecutar una clase)\n o {0} [-options] -jar jarfile [args...]\n\ (para ejecutar un archivo jar)\ndonde las opciones incluyen:\n
-java.launcher.opt.datamodel =\ -d{0}\t usar un modelo de datos de {0}-bits si est\u00e1 disponible\n
-java.launcher.opt.vmselect =\ {0}\t para seleccionar "{1}" VM\n
-java.launcher.opt.hotspot =\ {0}\t es un sin\u00f3nimo para la m\u00e1quina virtual "{1}" [deprecated]\n
+java.launcher.opt.datamodel =\ -d{0}\t usar un modelo de datos de {0} bits, si est\u00E1 disponible\n
+java.launcher.opt.vmselect =\ {0}\t para seleccionar la VM "{1}"\n
+java.launcher.opt.hotspot =\ {0}\t es un sin\u00F3nimo de la VM "{1}" [anticuada]\n
-java.launcher.ergo.message1 =\ La m\u00e1quina virtual predeterminada es {0}
-java.launcher.ergo.message2 =\ porque est\u00e1 trabajando en una m\u00e1quina de clase servidor.\n
+java.launcher.ergo.message1 =\ La VM por defecto es {0}
+java.launcher.ergo.message2 =\ porque la ejecuci\u00F3n se est\u00E1 llevando a cabo en una m\u00E1quina de clase de servidor.\n
# Translators please note do not translate the options themselves
-java.launcher.opt.footer =\ -cp <class search path of directories and zip/jar files>\n\ -classpath <class search path of directories and zip/jar files>\n\ Una {0} lista de directorios, archivos JAR,\n\ y archivos ZIP en los que buscar los archivos de clase.\n\ -D<name>=<value>\n\ establecer una propiedad de sistema\n\ -verbose[:class|gc|jni]\n\ permitir la salida detallada\n\ -version imprimir versi\u00f3n del producto y salir\n\ -version:<value>\n\ solicitar la versi\u00f3n especificada para ejecutar\n\ -showversion imprimir versi\u00f3n del producto y continuar\n\ -jre-restrict-search | -no-jre-restrict-search\n\ incluir/excluir JRE privados del usuario en la b\u00fasqueda de la versi\u00f3n\n\ -? -help imprimir este mensaje de ayuda\n\ -X imprimir ayuda en las opciones no est\u00e1ndar\n\ -ea[:<packagename>...|:<classname>]\n\ -enableassertions[:<packagename>...|:<classname>]\n\ permitir afirmaciones con granularidad especificada\n\ -da[:<packagename>...|:<classname>]\n\ -disableassertions[:<packagename>...|:<classname>]\n\ desactivar afirmaciones con granularidad especificada\n\ -esa | -enablesystemassertions\n\ permitir afirmaciones del sistema\n\ -dsa | -disablesystemassertions\n\ desactivar afirmaciones del sistema\n\ -agentlib:<libname>[=<options>]\n\ cargar biblioteca de agente nativo<libname>, por ejemplo -agentlib:hprof\n\ consulte tambi\u00e9n, -agentlib:jdwp=help y -agentlib:hprof=help\n\ -agentpath:<pathname>[=<options>]\n\ cargar biblioteca de agente nativo por ruta completa\n\ -javaagent:<jarpath>[=<options>]\n\ cargar agente del lenguaje de programaci\u00f3n Java, consulte java.lang.instrument\n\ -splash:<imagepath>\n\ mostrar pantalla de bienvenida con imagen especificada\nConsulte http://java.sun.com/javase/reference para m\u00e1s informaci\u00f3n.
+java.launcher.opt.footer =\ -cp <ruta de acceso de b\u00FAsqueda de clases de los directorios y los archivos zip/jar>\n\ -classpath <ruta de acceso de b\u00FAsqueda de clases de los directorios y los archivos zip/jar>\n\ Una lista separada por {0} de directorios, archivos JAR,\n\ y archivos ZIP para buscar archivos de clase.\n\ -D<nombre>=<valor>\n\ definir una propiedad del sistema\n\ -verbose[:class|gc|jni]\n\ activar la salida verbose\n\ -version imprimir la versi\u00F3n del producto y salir\n\ -version:<valor>\n\ es necesario que se ejecute la versi\u00F3n especificada\n\ -showversion imprimir la versi\u00F3n del producto y continuar\n\ -jre-restrict-search | -no-jre-restrict-search\n\ incluir/excluir JRE privados de usuario en la b\u00FAsqueda de versi\u00F3n\n\ -? -help imprimir este mensaje de ayuda\n\ -X imprimir la ayuda sobre las opciones que no sean est\u00E1ndar\n\ -ea[:<nombre_paquete>...|:<nombre_clase>]\n\ -enableassertions[:<nombre_paquete>...|:<nombre_clase>]\n\ activar afirmaciones con la granularidad especificada\n\ -da[:<nombre_paquete>...|:<nombre_clase>]\n\ -disableassertions[:<nombre_paquete>...|:<nombre_clase>]\n\ desactivar afirmaciones con la granularidad especificada\n\ -esa | -enablesystemassertions\n\ activar afirmaciones del sistema\n\ -dsa | -disablesystemassertions\n\ desactivar afirmaciones del sistema\n\ -agentlib:<nombre_bib>[=<opciones>]\n\ cargar la biblioteca de agente nativa <nombre_bib>, como -agentlib:hprof\n\ v\u00E9ase tambi\u00E9n -agentlib:jdwp=help y -agentlib:hprof=help\n\ -agentpath:<nombre_ruta_acceso>[=<opciones>]\n\ cargar biblioteca de agente nativa con la ruta de acceso completa\n\ -javaagent:<ruta_acceso_jar>[=<opciones>]\n\ cargar agente de lenguaje de programaci\u00F3n Java, v\u00E9ase java.lang.instrument\n\ -splash:<ruta_acceso_imagen>\n\ mostrar una pantalla de presentaci\u00F3n con la imagen especificada\nConsulte http://java.sun.com/javase/reference para obtener m\u00E1s informaci\u00F3n.
# Translators please note do not translate the options themselves
-java.launcher.X.usage=\ -Xmixed modo mixto de ejecuci\u00f3n (predeterminado)\n\ -Xint s\u00f3lo modo de ejecuci\u00f3n interpretado\n\ -Xbootclasspath:<directories and zip/jar files separated by {0}>\n\ definir ruta de b\u00fasqueda para clases y recursos de la rutina de carga\n\ -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n\ a\u00f1adir al final de la ruta de clase de la rutina de carga\n\ -Xbootclasspath/p:<directories and zip/jar files separated by {0}>\n\ a\u00f1adir al principio de la ruta de clase de la rutina de carga\n\ -Xnoclassgc desactivar recolecci\u00f3n de residuos de clase\n\ -Xincgc permitir recolecci\u00f3n de residuos incremental\n\ -Xloggc:<file> registrar estado de GC en un archivo con marcas de tiempo\n\ -Xbatch desactivar recopilaci\u00f3n de fondos\n\ -Xms<size> definir tama\u00f1o del mont\u00f3n de Java inicial\n\ -Xmx<size> definir tama\u00f1o m\u00e1ximo del mont\u00f3n de Java\n\ -Xss<size> definir tama\u00f1o de la pila del subproceso de java\n\ -Xprof salida de datos del perfil de la cpu\n\ -Xfuture permitir comprobaciones m\u00e1s estrictas para los procesos predeterminados futuros\n\ -Xrs reducir el uso de se\u00f1ales del SO por parte de Java o la m\u00e1quina virtual (consulte la documentaci\u00f3n)\n\ -Xcheck:jni realizar comprobaciones adicionales para las funciones de JNI\n\ -Xshare:off no intentar utilizar datos de clase compartidos\n\ -Xshare:auto utilizar datos de clase compartidos siempre que sea posible (predeterminado)\n\ -Xshare:on solicitar el uso obligatorio de datos de clase compartidos.\n\nLas opciones "-X" no son est\u00e1ndar y pueden sufrir modificaciones sin previo aviso.\n
+java.launcher.X.usage=\ -Xmixed ejecuci\u00F3n de modo mixto (por defecto)\n\ -Xint s\u00F3lo ejecuci\u00F3n de modo interpretado\n\ -Xbootclasspath:<directorios y archivos zip/jar separados por {0}>\n\ definir la ruta de acceso de b\u00FAsqueda para los recursos y clases de inicializaci\u00F3n de datos\n\ -Xbootclasspath/a:<directorios y archivos zip/jar separados por {0}>\n\ agregar al final de la ruta de acceso de la clase de inicializaci\u00F3n de datos\n\ -Xbootclasspath/p:<directorios y archivos zip/jar separados por {0}>\n\ anteponer a la ruta de acceso de la clase de inicializaci\u00F3n de datos\n\ -Xdiag mostrar mensajes de diagn\u00F3stico adicionales\n\ -Xnoclassgc desactivar la recolecci\u00F3n de basura de clases\n\ -Xincgc activar la recolecci\u00F3n de basura de clases\n\ -Xloggc:<archivo> registrar el estado de GC en un archivo con registros de hora\n\ -Xbatch desactivar compilaci\u00F3n en segundo plano\n\ -Xms<tama\u00F1o> definir tama\u00F1o de pila Java inicial\n\ -Xmx<tama\u00F1o> definir tama\u00F1o de pila Java m\u00E1ximo\n\ -Xss<tama\u00F1o> definir tama\u00F1o de la pila del thread de Java\n\ -Xprof datos de salida de creaci\u00F3n de perfil de CPU\n\ -Xfuture activar las comprobaciones m\u00E1s estrictas, anticip\u00E1ndose al futuro valor por defecto\n\ -Xrs reducir el uso de se\u00F1ales de sistema operativo por parte de Java/VM (consulte la documentaci\u00F3n)\n\ -Xcheck:jni realizar comprobaciones adicionales para las funciones de JNI\n\ -Xshare:off no intentar usar datos de clase compartidos\n\ -Xshare:auto usar datos de clase compartidos si es posible (valor por defecto)\n\ -Xshare:on es obligatorio el uso de datos de clase compartidos, de lo contrario se emitir\u00E1 un fallo.\n\ -XshowSettings mostrar todos los valores y continuar\n\ -XshowSettings:all\n\ mostrar todos los valores y continuar\n\ -XshowSettings:vm mostrar todos los valores de la VM y continuar\n\ -XshowSettings:properties\n\ mostrar todos los valores de las propiedades y continuar\n\ -XshowSettings:locale\n\ mostrar todos los valores relacionados con la configuraci\u00F3n regional y continuar\n\nLas opciones -X no son est\u00E1ndar, por lo que podr\u00EDan cambiarse sin previo aviso.\n
-java.launcher.cls.error1=Error: no se pudo encontrar la clase principal {0}
-java.launcher.cls.error2=Error: el m\u00e9todo principal no es {0} en la clase {1}, defina el m\u00e9todo principal como:\n\ public static void main(String[] args)
-java.launcher.cls.error3=Error: el m\u00e9todo principal debe volver a ser un valor de tipo vac\u00edo en la clase {0}, defina \nel m\u00e9todo principal como:\n\ public static void main(String[] args)
-java.launcher.cls.error4=Error: m\u00e9todo principal no encontrado en la clase {0}, defina el m\u00e9todo principal como:\n\ public static void main(String[] args)
-
-
+java.launcher.cls.error1=Error: no se ha encontrado o cargado la clase principal {0}
+java.launcher.cls.error2=Error: el m\u00E9todo principal no es {0} en la clase {1}, defina el m\u00E9todo principal del siguiente modo:\n\ public static void main(String[] args)
+java.launcher.cls.error3=Error: el m\u00E9todo principal debe devolver un valor del tipo void en la clase {0}, \ndefina el m\u00E9todo principal del siguiente modo:\n\ public static void main(String[] args)
+java.launcher.cls.error4=Error: no se ha encontrado el m\u00E9todo principal en la clase {0}, defina el m\u00E9todo principal del siguiente modo:\n\ public static void main(String[] args)
+java.launcher.jar.error1=Error: se ha producido un error inesperado al intentar abrir el archivo {0}
+java.launcher.jar.error2=no se ha encontrado el manifiesto en {0}
+java.launcher.jar.error3=no hay ning\u00FAn atributo de manifiesto principal en {0}
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_fr.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_fr.properties Mon Apr 11 16:19:20 2011 -0700
@@ -24,24 +24,25 @@
#
# Translators please note do not translate the options themselves
-java.launcher.opt.header = Utilisation\u00a0: {0} [-options] class [args...]\n\ (pour ex\u00e9cuter une classe)\n ou {0} [-options] -jar jarfile [args...]\n\ (pour ex\u00e9cuter un fichier jar)\no\u00f9 les options sont\u00a0:\n
+java.launcher.opt.header = Syntaxe : {0} [-options] class [args...]\n\ (pour l''ex\u00E9cution d''une classe)\n ou {0} [-options] -jar jarfile [args...]\n\ (pour l''ex\u00E9cution d''un fichier JAR)\no\u00F9 les options comprennent :\n
-java.launcher.opt.datamodel =\ -d{0}\t utiliser un mod\u00e8le de donn\u00e9es {0}\u00a0bits, le cas \u00e9ch\u00e9ant\n
-java.launcher.opt.vmselect =\ {0}\t s\u00e9lectionner la machine virtuelle "{1}"\n
-java.launcher.opt.hotspot =\ {0}\t est un synonyme de la machine virtuelle "{1}" [\u00e0 \u00e9viter]\n
+java.launcher.opt.datamodel =\ -d{0}\t utilisez le mod\u00E8le de donn\u00E9es {0} bits s''il est disponible\n
+java.launcher.opt.vmselect =\ {0}\t pour s\u00E9lectionner la machine virtuelle "{1}"\n
+java.launcher.opt.hotspot =\ {0}\t est un synonyme pour la machine virtuelle "{1}" [en phase d''abandon]\n
-java.launcher.ergo.message1 =\ La machine virtuelle par d\u00e9faut est {0}
-java.launcher.ergo.message2 =\ car vous utilisez une machine de type serveur.\n
+java.launcher.ergo.message1 =\ La machine virtuelle par d\u00E9faut est {0}
+java.launcher.ergo.message2 =\ car vous ex\u00E9cutez une machine de classe de serveur.\n
# Translators please note do not translate the options themselves
-java.launcher.opt.footer =\ -cp <chemin de recherche de classe des r\u00e9pertoires et fichiers zip/jar>\n\ -classpath <chemin de recherche de classe des r\u00e9pertoires et fichiers zip/jar>\n\ Une liste s\u00e9par\u00e9e {0} de r\u00e9pertoires, archives JAR\n\ et archives ZIP dans laquelle rechercher des fichiers de classe.\n\ -D<nom>=<valeur>\n\ d\u00e9finir une propri\u00e9t\u00e9 syst\u00e8me\n\ -verbose[:class|gc|jni]\n\ activer une sortie d\u00e9taill\u00e9ee\n\ -version imprimer la version du produit et quitter\n\ -version:<valeur>\n\ utiliser la version sp\u00e9cifi\u00e9e pour l''ex\u00e9cution\n\ -showversion imprimer la version du produit et continuer\n\ -jre-restrict-search | -no-jre-restrict-search\n\ inclure/exclure les JRE priv\u00e9s d''utilisateur dans la recherche de version\n\ -? -help imprimer ce message d''aide\n\ -X imprimer l''aide relative aux options non standard\n\ -ea[:<nom du package>...|:<nom de la classe>]\n\ -enableassertions[:<nom du package>...|:<nom de la classe>]\n\ activer les assertions avec la granularit\u00e9 sp\u00e9cifi\u00e9e\n\ -da[:<nom du package>...|:<nom de la classe>]\n\ -disableassertions[:<nom du package>...|:<nom de la classe>]\n\ d\u00e9sactiver les assertions avec la granularit\u00e9 sp\u00e9cifi\u00e9e\n\ -esa | -enablesystemassertions\n\ activer les assertions syst\u00e8me\n\ -dsa | -disablesystemassertions\n\ d\u00e9sactiver les assertions syst\u00e8me\n\ -agentlib:<nom de la biblioth\u00e8que>[=<options>]\n\ charger la biblioth\u00e8que d''agents natifs<nom de la biblioth\u00e8que>, par exemple -agentlib:hprof\n\ voir \u00e9galement, -agentlib:jdwp=help et -agentlib:hprof=help\n\ -agentpath:<nom du chemin>[=<options>]\n\ charger la biblioth\u00e8que d''agents natifs en indiquant le chemin complet\n\ -javaagent:<chemin jar>[=<options>]\n\ charger l''agent de langage de programmation Java, voir java.lang.instrument\n\ -splash:<chemin de l''image>\n\ afficher l''\u00e9cran de bienvenue avec l''image sp\u00e9cifi\u00e9e\nPour plus de d\u00e9tails, reportez-vous \u00e0 la page http://java.sun.com/javase/reference.
+java.launcher.opt.footer =\ -cp <class search path of directories and zip/jar files>\n\ -classpath <class search path of directories and zip/jar files>\n\ Liste de r\u00E9pertoires, d''archives JAR et\n\ d''archives ZIP s\u00E9par\u00E9s par des {0}, dans laquelle rechercher les fichiers de classe.\n\ -D<name>=<value>\n\ d\u00E9finition d''une propri\u00E9t\u00E9 syst\u00E8me\n\ -verbose[:class|gc|jni]\n\ activation de la sortie en mode verbose\n\ -version impression de la version du produit et fin de l''op\u00E9ration\n\ -version:<value>\n\ ex\u00E9cution de la version sp\u00E9cifi\u00E9e obligatoire\n\ -showversion impression de la version du produit et poursuite de l''op\u00E9ration\n\ -jre-restrict-search | -no-jre-restrict-search\n\ inclusion/exclusion des environnements JRE priv\u00E9s de l''utilisateur dans la recherche de version\n\ -? -help impression du message d''aide\n\ -X impression de l''aide sur les options non standard\n\ -ea[:<packagename>...|:<classname>]\n\ -enableassertions[:<packagename>...|:<classname>]\n\ activation des assertions avec la granularit\u00E9 sp\u00E9cifi\u00E9e\n\ -da[:<packagename>...|:<classname>]\n\ -disableassertions[:<packagename>...|:<classname>]\n\ d\u00E9sactivation des assertions avec la granularit\u00E9 sp\u00E9cifi\u00E9e\n\ -esa | -enablesystemassertions\n\ activation des assertions syst\u00E8me\n\ -dsa | -disablesystemassertions\n\ d\u00E9sactivation des assertions syst\u00E8me\n\ -agentlib:<libname>[=<options>]\n\ chargement de la biblioth\u00E8que d''agent natif <libname>, par exemple -agentlib:hprof\n\ voir \u00E9galement, -agentlib:jdwp=help et -agentlib:hprof=help\n\ -agentpath:<pathname>[=<options>]\n\ chargement de la biblioth\u00E8que d''agent natif via le chemin d''acc\u00E8s complet\n\ -javaagent:<jarpath>[=<options>]\n\ chargement de l''agent du langage de programmation Java, voir java.lang.instrument\n\ -splash:<imagepath>\n\ affichage de l''\u00E9cran d''accueil avec l''image sp\u00E9cifi\u00E9e\nVoir http://java.sun.com/javase/reference pour plus de d\u00E9tails.
# Translators please note do not translate the options themselves
-java.launcher.X.usage=\ -Xmixed ex\u00e9cution du mode compil\u00e9 (par d\u00e9faut)\n\ -Xint ex\u00e9cution du mode interpr\u00e9t\u00e9 uniquement\n\ -Xbootclasspath:<r\u00e9pertoires et fichiers zip/jar s\u00e9par\u00e9s par {0}>\n\ d\u00e9finir le chemin de recherche pour les classes et ressources bootstrap\n\ -Xbootclasspath/a:<r\u00e9pertoires et fichiers zip/jar s\u00e9par\u00e9s par {0}>\n\ ajouter \u00e0 la fin du chemin de la classe bootstrap\n\ -Xbootclasspath/p:<r\u00e9pertoires et fichiers zip/jar s\u00e9par\u00e9s par {0}>\n\ ajouter au d\u00e9but du chemin de la classe bootstrap\n\ -Xnoclassgc d\u00e9sactiver la collection d''informations parasites sur la classe\n\ -Xincgc activer la collection incr\u00e9mentielle d''informations parasites\n\ -Xloggc:<fichier> enregistrer le statut GC dans un fichier horodat\u00e9\n\ -Xbatch d\u00e9sactiver la compilation d''arri\u00e8re-plans\n\ -Xms<taille> d\u00e9finir la taille initiale des tas Java\n\ -Xmx<taille> d\u00e9finir la taille maximale des tas Java\n\ -Xss<taille> d\u00e9finir la taille des piles de fil Java\n\ -Xprof \u00e9mettre des donn\u00e9es de profilage d''UC\n\ -Xfuture activer des contr\u00f4les plus stricts, en anticipant les erreurs futures\n\ -Xrs r\u00e9duire l''utilisation des signaux d''OS par Java/la machine virtuelle (reportez-vous \u00e0 la documentation)\n\ -Xcheck:jni effectuer des contr\u00f4les suppl\u00e9mentaires pour les fonctions JNI\n\ -Xshare:off ne pas tenter d''utiliser les donn\u00e9es de classe partag\u00e9es\n\ -Xshare:auto utiliser les donn\u00e9es de classe partag\u00e9es si possible (par d\u00e9faut)\n\ -Xshare:on forcer l''utilisation de donn\u00e9es de classe partag\u00e9es, sinon \u00e9chec.\n\nLes options\u00a0X ne sont pas standard et sont sujettes \u00e0 modification sans pr\u00e9avis.\n
+java.launcher.X.usage=\ -Xmixed ex\u00E9cution en mode mixte (valeur par d\u00E9faut)\n\ -Xint ex\u00E9cution en mode interpr\u00E9t\u00E9 uniquement\n\ -Xbootclasspath:<directories and zip/jar files separated by {0}>\n\ d\u00E9finition du chemin de recherche pour les ressources et classes bootstrap\n\ -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n\ ajout \u00E0 la fin du chemin de classe bootstrap\n\ -Xbootclasspath/p:<directories and zip/jar files separated by {0}>\n\ ajout au d\u00E9but du chemin de classe bootstrap\n\ -Xdiag affichage de messages de diagnostic suppl\u00E9mentaires\n\ -Xnoclassgc d\u00E9sactivation de l''op\u00E9ration de ramasse-miette (garbage collection) de la classe\n\ -Xincgc activation de l''op\u00E9ration de ramasse-miette (garbage collection) incr\u00E9mentielle\n\ -Xloggc:<file> journalisation du statut de l''op\u00E9ration de ramasse-miette (garbage collection) dans un fichier avec horodatages\n\ -Xbatch d\u00E9sactivation de la compilation en arri\u00E8re-plan\n\ -Xms<size> d\u00E9finition de la taille initiale des portions de m\u00E9moire Java\n\ -Xmx<size> d\u00E9finition de la taille maximale des portions de m\u00E9moire Java\n\ -Xss<size> d\u00E9finition de la taille de pile de thread Java\n\ -Xprof sortie des donn\u00E9es de profilage de l''unit\u00E9 centrale\n\ -Xfuture activation des contr\u00F4les les plus stricts en vue d''anticiper la future valeur par d\u00E9faut\n\ -Xrs r\u00E9duction de l''utilisation des signaux OS par Java/la machine virtuelle (voir documentation)\n\ -Xcheck:jni ex\u00E9cution de contr\u00F4les suppl\u00E9mentaires pour les fonctions JNI\n\ -Xshare:off aucune tentative d''utilisation des donn\u00E9es de classe partag\u00E9es\n\ -Xshare:auto utilisation des donn\u00E9es de classe partag\u00E9es si possible (valeur par d\u00E9faut)\n\ -Xshare:on utilisation des donn\u00E9es de classe partag\u00E9es obligatoire ou \u00E9chec de l''op\u00E9ration\n\ -XshowSettings affichage de tous les param\u00E8tres et poursuite de l''op\u00E9ration\n\ -XshowSettings:all\n\ affichage de tous les param\u00E8tres et poursuite de l''op\u00E9ration\n\ -XshowSettings:vm affichage de tous les param\u00E8tres de machine virtuelle et poursuite de l''op\u00E9ration\n\ -XshowSettings:properties\n\ affichage de tous les param\u00E8tres de propri\u00E9t\u00E9 et poursuite de l''op\u00E9ration\n\ -XshowSettings:locale\n\ affichage de tous les param\u00E8tres d''environnement local et poursuite de l''op\u00E9ration\n\nLes options -X ne sont pas des options standard et peuvent faire l''objet de modifications sans pr\u00E9avis.\n
-java.launcher.cls.error1=Erreur\u00a0: Impossible de trouver la classe {0} principale
-java.launcher.cls.error2=Erreur\u00a0: La m\u00e9thode principale n''est pas {0} dans la classe {1}. Veuillez d\u00e9finir la m\u00e9thode principale comme\u00a0:\n\ public static void main(String[] args)
-java.launcher.cls.error3=Erreur\u00a0: La m\u00e9thode principale doit renvoyer une valeur de type null dans la classe \{0\. Veuillez \nd\u00e9finir la m\u00e9thode principale comme\u00a0:\n\ public static void main(String[] args)
-java.launcher.cls.error4=Erreur\u00a0: M\u00e9thode principale introuvable dans la classe {0}. Veuillez d\u00e9finir la m\u00e9thode principale comme\u00a0:\n\ public static void main(String[] args)
-
-
+java.launcher.cls.error1=Erreur : impossible de trouver ou charger la classe principale {0}
+java.launcher.cls.error2=Erreur : la m\u00E9thode principale n''est pas {0} dans la classe {1}, d\u00E9finissez la m\u00E9thode principale comme suit :\n\ public static void main(String[] args)
+java.launcher.cls.error3=Erreur : la m\u00E9thode principale doit renvoyer une valeur de type void dans la classe {0}, \nd\u00E9finissez la m\u00E9thode principale comme suit :\n\ public static void main(String[] args)
+java.launcher.cls.error4=Erreur : la m\u00E9thode principale est introuvable dans la classe {0}, d\u00E9finissez la m\u00E9thode principale comme suit :\n\ public static void main(String[] args)
+java.launcher.jar.error1=Erreur : une erreur inattendue est survenue lors de la tentative d''ouverture du fichier {0}
+java.launcher.jar.error2=fichier manifeste introuvable dans {0}
+java.launcher.jar.error3=aucun attribut manifest principal dans {0}
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_it.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_it.properties Mon Apr 11 16:19:20 2011 -0700
@@ -24,24 +24,25 @@
#
# Translators please note do not translate the options themselves
-java.launcher.opt.header = Utilizzo: {0} [-opzioni] class [argom...]\n\ (per eseguire una classe)\n o {0} [-opzioni] -jar jarfile [argom...]\n\ (per eseguire un file jar)\ndove le opzioni includono:\n
+java.launcher.opt.header = Uso: {0} [-opzioni] class [argomenti...]\n\ (per eseguire una classe)\n oppure {0} [-opzioni] -jar filejar [argomenti...]\n\ (per eseguire un file jar)\ndove le opzioni sono:\n
-java.launcher.opt.datamodel =\ -d{0}\t utilizzo di un modello di dati a {0} bit, se disponibile\n
-java.launcher.opt.vmselect =\ {0}\t per selezionare la macchina virtuale "{1}"\n
-java.launcher.opt.hotspot =\ {0}\t \u00e8 sinonimo della macchina virtuale "{1}" [obsoleta]\n
+java.launcher.opt.datamodel =\ -d{0}\t usare un modello di dati {0}-bit se disponibile\n
+java.launcher.opt.vmselect =\ {0}\t per selezionare la VM "{1}"\n
+java.launcher.opt.hotspot =\ {0}\t \u00E8 un sinonimo per la VM "{1}" [non valido]\n
-java.launcher.ergo.message1 =\ La macchina virtuale predefinita \u00e8 {0}
-java.launcher.ergo.message2 =\ perch\u00e9 l'esecuzione avviene su una macchina di classe server.\n
+java.launcher.ergo.message1 =\ La VM predefinita \u00E8 {0}
+java.launcher.ergo.message2 =\ perch\u00E9 si utilizza un computer di classe server.\n
# Translators please note do not translate the options themselves
-java.launcher.opt.footer =\ -cp <percorso di ricerca classe di directory e file zip/jar>\n\ -classpath <percorso di ricerca classe di directory e file zip/jar>\n\ Elenco separato da {0} di directory, archivi JAR\n\ e archivi ZIP in cui cercare i file di classe.\n\ -D<nome>=<valore>\n\ imposta una propriet\u00e0 di sistema\n\ -verbose[:class|gc|jni]\n\ attiva l''output dettagliato\n\ -version stampa la versione del prodotto ed esce\n\ -version:<valore>\n\ richiede la versione specificata per l''esecuzione\n\ -showversion stampa la versione del prodotto e procede\n\ -jre-restrict-search | -no-jre-restrict-search\n\ consente di includere/escludere JRE privati dell''utente nella ricerca della versione\n\ -? -help stampa il presente messaggio della Guida\n\ -X stampa la Guida delle opzioni non standard\n\ -ea[:<nomepacchetto>...|:<nomeclasse>]\n\ -enableassertions[:<nomepacchetto>...|:<nomeclasse>]\n\ attiva le asserzioni con la granularit\u00e0 specificata\n\ -da[:<nomepacchetto>...|:<nomeclasse>]\n\ -disableassertions[:<nomepacchetto>...|:<nomeclasse>]\n\ disattiva le asserzioni con la granularit\u00e0 specificata\n\ -esa | -enablesystemassertions\n\ attiva le asserzioni di sistema\n\ -dsa | -disablesystemassertions\n\ disattiva le asserzioni di sistema\n\ -agentlib:<nomelibreria>[=<opzioni>]\n\ carica la libreria agente nativa <nomelibreria>, ad es. -agentlib:hprof\n\ vedere anche, -agentlib:jdwp=help e -agentlib:hprof=help\n\ -agentpath:<percorso>[=<opzioni>]\n\ carica la libreria agente nativa in base al percorso completo\n\ -javaagent:<percorsojar>[=<opzioni>]\n\ carica l''agente del linguaggio di programmazione Java, vedere java.lang.instrument\n\ -splash:<percorsoimmagine>\n\ mostra la schermata iniziale con l''immagine specificata\nPer ulteriori informazioni, visitare http://java.sun.com/javase/reference.
+java.launcher.opt.footer =\ -cp <classpath di ricerca di directory e file zip/jar>\n\ -classpath <classpath di ricerca di directory e file zip/jar>\n\ Una lista separata da {0} di directory, archivi JAR\n\ e archivi ZIP utilizzata per la ricerca di file di classe.\n\ -D<nome>=<valore>\n\ imposta una propriet\u00E0 di sistema\n\ -verbose[:class|gc|jni]\n\ abilita l''output descrittivo\n\ -version stampa la versione del prodotto ed esce\n\ -version:<valore>\n\ richiede l''esecuzione della versione specificata\n\ -showversion stampa la versione del prodotto e continua\n\ -jre-restrict-search | -no-jre-restrict-search\n\ include/esclude gli ambienti JRE privati dell''utente nella ricerca della versione\n\ -? -help stampa questo messaggio della Guida\n\ -X stampa la Guida sulle opzioni non standard\n\ -ea[:<nomepackage>...|:<nomeclasse>]\n\ -enableassertions[:<nomepackage>...|:<nomeclasse>]\n\ abilita le asserzioni con la granularit\u00E0 specificata\n\ -da[:<nomepackage>...|:<nomeclasse>]\n\ -disableassertions[:<nomepackage>...|:<nomeclasse>]\n\ disabilita le asserzioni con la granularit\u00E0 specificata\n\ -esa | -enablesystemassertions\n\ abilita le asserzioni di sistema\n\ -dsa | -disablesystemassertions\n\ disabilita le asserzioni di sistema\n\ -agentlib:<nomelib>[=<opzioni>]\n\ carica la libreria agenti nativa <nomelib>, ad esempio -agentlib:hprof\n\ vedere anche -agentlib:jdwp=help and -agentlib:hprof=help\n\ -agentpath:<nomepercorso>[=<opzioni>]\n\ carica la libreria agenti nativa con il percorso completo\n\ -javaagent:<percorsojar>[=<opzioni>]\n\ carica l''agente del linguaggio di programmazione Java. Vedere java.lang.instrument\n\ -splash:<percorsoimmagine>\n\ mostra la schermata iniziale con l''immagine specificata\nVedere http://java.sun.com/javase/reference per maggiori dettagli.
# Translators please note do not translate the options themselves
-java.launcher.X.usage=\ -Xmixed esecuzione in modalit\u00e0 mista (predefinita)\n\ -Xint solo esecuzione in modalit\u00e0 interpretata\n\ -Xbootclasspath:<directory e file zip/jar separati da {0}>\n\ imposta il percorso di ricerca per classi e risorse di bootstrap\n\ -Xbootclasspath/a:<directory e file zip/jar separati da {0}>\n\ accoda alla fine del percorso della classe di bootstrap\n\ -Xbootclasspath/p:<directory e file zip/jar separati da {0}>\n\ antepone al percorso della classe di bootsrap\n\ -Xnoclassgc disattiva Garbage Collection per la classe\n\ -Xincgc attiva Garbage Collection incrementale\n\ -Xloggc:<file> registra lo stato GC in un file con timestamp\n\ -Xbatch disattiva la compilazione in background\n\ -Xms<dimensione> imposta la dimensione heap Java iniziale\n\ -Xmx<dimensione> imposta la dimensione heap Java massima\n\ -Xss<dimensione> imposta la dimensione dello stack del thread Java\n\ -Xprof dati di profilo della CPU di output\n\ -Xfuture attiva verifiche pi\u00f9 dettagliate, anticipa le impostazioni predefinite future\n\ -Xrs riduce l''uso di segnali OS da parte di Java o della macchina virtuale (vedere la documentazione)\n\ -Xcheck:jni esegue verifiche aggiuntive per le funzioni JNI\n\ -Xshare:off esclude l''utilizzo di dati classe condivisi\n\ -Xshare:auto imposta l''utilizzo di dati classe condivisi ogni volta che \u00e8 possibile (impostazione predefinita)\n\ -Xshare:on richiede l''utilizzo di dati classe condivisi, in caso contrario origina un errore.\n\nLe opzioni -X sono non standard e soggette a modifiche senza preavviso.\n
+java.launcher.X.usage=\ -Xmixed esecuzione in modalit\u00E0 mista (impostazione predefinita)\n\ -Xint esecuzione solo in modalit\u00E0 convertita\n\ -Xbootclasspath:<directory e file zip/jar separati da {0}>\n\ imposta il percorso di ricerca per le classi e le risorse di bootstrap\n\ -Xbootclasspath/a:<directory e file zip/jar separati da {0}>\n\ aggiunge alla fine del classpath di bootstrap\n\ -Xbootclasspath/p:<directory e file zip/jar separati da {0}>\n\ antepone al classpath di bootstrap\n\ -Xdiag mostra messaggi di diagnostica aggiuntivi\n\ -Xnoclassgc disabilita la garbage collection della classe\n\ -Xincgc abilita la garbage collection incrementale\n\ -Xloggc:<file> registra lo stato GC in un file di log con indicatori orari\n\ -Xbatch disabilita la compilazione in background\n\ -Xms<dimensione> imposta la dimensione heap Java iniziale\n\ -Xmx<dimensione> imposta la dimensione heap Java massima\n\ -Xss<dimensione> imposta la dimensione dello stack di thread Java\n\ -Xprof visualizza i dati di profilo della CPU\n\ -Xfuture abilita i controlli pi\u00F9 limitativi anticipando le impostazioni predefinite future\n\ -Xrs riduce l''uso di segnali del sistema operativo da Java/VM (vedere la documentazione)\n\ -Xcheck:jni esegue controlli aggiuntivi per le funzioni JNI\n\ -Xshare:off non tenta di utilizzare i dati della classe condivisi\n\ -Xshare:auto utilizza i dati di classe condivisi se possibile (impostazione predefinita)\n\ -Xshare:on richiede l''uso dei dati di classe condivisi, altrimenti l''esecuzione non riesce.\n\ -XshowSettings mostra tutte le impostazioni e continua\n\ -XshowSettings:all\n\ mostra tutte le impostazioni e continua\n\ -XshowSettings:vm mostra tutte le impostazioni correlate alla VM e continua\n\ -XshowSettings:properties\n\ mostra tutte le impostazioni delle propriet\u00E0 e continua\n\ -XshowSettings:locale\n\ mostra tutte le impostazioni correlate alle impostazioni nazionali e continua\n\nLe opzioni -X non sono opzioni standard e sono soggette a modifiche senza preavviso.\n
-java.launcher.cls.error1=Errore: Classe principale {0} non trovata.
-java.launcher.cls.error2=Errore: Il metodo principale non \u00e8 {0} nella classe {1}. Definire il nuovo metodo come:\n\ public static void main(String[] args)
-java.launcher.cls.error3=Errore: Il metodo principale deve restituire un valore di tipo void nella classe {0}. \nDefinire il nuovo metodo come:\n\ public static void main(String[] args)
-java.launcher.cls.error4=Errore: Metodo principale non trovato nella classe {0}. Definire il metodo principale come:\n\ public static void main(String[] args)
-
-
+java.launcher.cls.error1=Errore: impossibile trovare o caricare la classe principale {0}
+java.launcher.cls.error2=Errore: il metodo principale non \u00E8 {0} nella classe {1}. Definire il metodo principale come:\n\ public static void main(String[] args)
+java.launcher.cls.error3=Errore: il metodo principale deve restituire un valore di tipo void nella classe {0}. \nDefinire il metodo principale come:\n\ public static void main(String[] args)
+java.launcher.cls.error4=Errore: il metodo principale non \u00E8 stato trovato nella classe {0}. Definire il metodo principale come:\n\ public static void main(String[] args)
+java.launcher.jar.error1=Errore: si \u00E8 verificato un errore imprevisto durante il tentativo di aprire il file {0}
+java.launcher.jar.error2=manifest non trovato in {0}
+java.launcher.jar.error3=nessun attributo manifest principale in {0}
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_ja.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_ja.properties Mon Apr 11 16:19:20 2011 -0700
@@ -24,24 +24,25 @@
#
# Translators please note do not translate the options themselves
-java.launcher.opt.header = \u4f7f\u7528\u6cd5: {0} [-options] class [args...]\n\ (\u30af\u30e9\u30b9\u3092\u5b9f\u884c\u3059\u308b)\n \u307e\u305f\u306f {0} [-options] -jar jarfile [args...]\n\ (jar \u30d5\u30a1\u30a4\u30eb\u3092\u5b9f\u884c\u3059\u308b)\n\u30aa\u30d7\u30b7\u30e7\u30f3\u306b\u306f\u4ee5\u4e0b\u306e\u3082\u306e\u304c\u3042\u308a\u307e\u3059:\n
+java.launcher.opt.header = \u4F7F\u7528\u65B9\u6CD5: {0} [-options] class [args...]\n\ (\u30AF\u30E9\u30B9\u3092\u5B9F\u884C\u3059\u308B\u5834\u5408)\n \u307E\u305F\u306F {0} [-options] -jar jarfile [args...]\n\ (jar\u30D5\u30A1\u30A4\u30EB\u3092\u5B9F\u884C\u3059\u308B\u5834\u5408)\noptions\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059\u3002\n
-java.launcher.opt.datamodel =\ -d{0}\t {0}-bit \u30c7\u30fc\u30bf\u30e2\u30c7\u30eb\u3092\u4f7f\u7528 (\u53ef\u80fd\u306a\u5834\u5408)\n
-java.launcher.opt.vmselect =\ {0}\t "{1}" VM \u3092\u9078\u629e\n
-java.launcher.opt.hotspot =\ {0}\t "{1}" VM \u306e\u540c\u7fa9\u8a9e\u3067\u3059 [\u975e\u63a8\u5968]\n
+java.launcher.opt.datamodel =\ -d{0}\t \u4F7F\u7528\u53EF\u80FD\u306A\u5834\u5408\u306F{0}\u30D3\u30C3\u30C8\u306E\u30C7\u30FC\u30BF\u30FB\u30E2\u30C7\u30EB\u3092\u4F7F\u7528\u3059\u308B\n
+java.launcher.opt.vmselect =\ {0}\t "{1}" VM\u3092\u9078\u629E\u3059\u308B\u5834\u5408\n
+java.launcher.opt.hotspot =\ {0}\t \u306F"{1}" VM\u306E\u30B7\u30CE\u30CB\u30E0\u3067\u3059 [\u975E\u63A8\u5968]\n
-java.launcher.ergo.message1 =\ \u30c7\u30d5\u30a9\u30eb\u30c8 VM \u306f {0} \u3067\u3059
-java.launcher.ergo.message2 =\ \u7406\u7531\u306f\u3001\u30b5\u30fc\u30d0\u30fc\u30af\u30e9\u30b9\u306e\u30de\u30b7\u30f3\u3092\u4f7f\u7528\u3057\u3066\u3044\u308b\u304b\u3089\u3067\u3059\u3002\n
+java.launcher.ergo.message1 =\ \u30C7\u30D5\u30A9\u30EB\u30C8VM\u306F{0}\u3067\u3059
+java.launcher.ergo.message2 =\ \u3053\u308C\u306F\u30B5\u30FC\u30D0\u30FC\u30AF\u30E9\u30B9\u306E\u30DE\u30B7\u30F3\u3067\u5B9F\u884C\u3057\u3066\u3044\u308B\u305F\u3081\u3067\u3059\u3002\n
# Translators please note do not translate the options themselves
-java.launcher.opt.footer =\ -cp <\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u304a\u3088\u3073 ZIP/JAR \u30d5\u30a1\u30a4\u30eb\u306e\u30af\u30e9\u30b9\u691c\u7d22\u30d1\u30b9>\n\ -classpath <\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u304a\u3088\u3073 ZIP/JAR \u30d5\u30a1\u30a4\u30eb\u306e\u30af\u30e9\u30b9\u691c\u7d22\u30d1\u30b9>\n\ \u30af\u30e9\u30b9\u30d5\u30a1\u30a4\u30eb\u3092\u691c\u7d22\u3059\u308b\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3001JAR \u30a2\u30fc\u30ab\u30a4\u30d6\u3001\n\ \u304a\u3088\u3073 ZIP \u30a2\u30fc\u30ab\u30a4\u30d6\u306e {0} \u3067\u5206\u5272\u3055\u308c\u305f\u30ea\u30b9\u30c8\u3002\n\ -D<name>=<value>\n\ \u30b7\u30b9\u30c6\u30e0\u30d7\u30ed\u30d1\u30c6\u30a3\u30fc\u306e\u8a2d\u5b9a\n\ -verbose[:class|gc|jni]\n\ \u8a73\u7d30\u51fa\u529b\u306e\u6709\u52b9\u5316\n\ -version \u88fd\u54c1\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u5370\u5237\u3057\u3066\u7d42\u4e86\n\ -version:<value>\n\ \u5b9f\u884c\u306b\u5fc5\u8981\u306a\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u8981\u6c42\n\ -showversion \u88fd\u54c1\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u5370\u5237\u3057\u3066\u7d99\u7d9a\n\ -jre-restrict-search | -no-jre-restrict-search\n\ \u30d0\u30fc\u30b8\u30e7\u30f3\u691c\u7d22\u306b\u30e6\u30fc\u30b6\u30fc\u306e\u975e\u516c\u958b JRE \u3092\u542b\u3081\u308b\u304b\u9664\u5916\u3059\u308b\u304b\u3092\u5207\u308a\u66ff\u3048\u308b\n\ -? -help \u3053\u306e\u30d8\u30eb\u30d7\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u5370\u5237\n\ -X \u975e\u6a19\u6e96\u30aa\u30d7\u30b7\u30e7\u30f3\u306e\u30d8\u30eb\u30d7\u3092\u5370\u5237\n\ -ea[:<packagename>...|:<classname>]\n\ -enableassertions[:<packagename>...|:<classname>]\n\ \u6307\u5b9a\u3057\u305f\u7c92\u5ea6\u3067\u30a2\u30b5\u30fc\u30b7\u30e7\u30f3\u3092\u6709\u52b9\u5316\n\ -da[:<packagename>...|:<classname>]\n\ -disableassertions[:<packagename>...|:<classname>]\n\ \u6307\u5b9a\u3057\u305f\u7c92\u5ea6\u3067\u30a2\u30b5\u30fc\u30b7\u30e7\u30f3\u3092\u7121\u52b9\u5316\n\ -esa | -enablesystemassertions\n\ \u30b7\u30b9\u30c6\u30e0\u30a2\u30b5\u30fc\u30b7\u30e7\u30f3\u3092\u6709\u52b9\u5316\n\ -dsa | -disablesystemassertions\n\ \u30b7\u30b9\u30c6\u30e0\u30a2\u30b5\u30fc\u30b7\u30e7\u30f3\u3092\u7121\u52b9\u5316\n\ -agentlib:<libname>[=<options>]\n\ \u30cd\u30a4\u30c6\u30a3\u30d6\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u30e9\u30a4\u30d6\u30e9\u30ea <libname> (\u4f8b: -agentlib:hprof) \u3092\u30ed\u30fc\u30c9\n\ \u95a2\u9023\u9805\u76ee\u3001 -agentlib:jdwp=help and -agentlib:hprof=help\n\ -agentpath:<pathname>[=<options>]\n\ \u5b8c\u5168\u306a\u30d1\u30b9\u540d\u3067\u30cd\u30a4\u30c6\u30a3\u30d6\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u30e9\u30a4\u30d6\u30e9\u30ea\u3092\u30ed\u30fc\u30c9\n\ -javaagent:<jarpath>[=<options>]\n\ Java \u30d7\u30ed\u30b0\u30e9\u30df\u30f3\u30b0\u8a00\u8a9e\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u3092\u30ed\u30fc\u30c9\u3002java.lang.instrument \u3092\u53c2\u7167\n\ -splash:<imagepath>\n\ \u6307\u5b9a\u3057\u305f\u753b\u50cf\u306e\u30b9\u30d7\u30e9\u30c3\u30b7\u30e5\u753b\u9762\u3092\u8868\u793a\n\u8a73\u7d30\u306f http://java.sun.com/javase/reference \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+java.launcher.opt.footer =\ -cp <class search path of directories and zip/jar files>\n\ -classpath <class search path of directories and zip/jar files>\n\ \u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001\n\ JAR\u30A2\u30FC\u30AB\u30A4\u30D6\u304A\u3088\u3073ZIP\u30A2\u30FC\u30AB\u30A4\u30D6\u306E{0}\u3067\u533A\u5207\u3089\u308C\u305F\u30EA\u30B9\u30C8\u3067\u3059\u3002\n\ -D<name>=<value>\n\ \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8A2D\u5B9A\u3059\u308B\n\ -verbose[:class|gc|jni]\n\ \u8A73\u7D30\u306A\u51FA\u529B\u3092\u884C\u3046\n\ -version \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3059\u308B\n\ -version:<value>\n\ \u6307\u5B9A\u3057\u305F\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u5B9F\u884C\u306B\u5FC5\u9808\u306B\u3059\u308B\n\ -showversion \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3059\u308B\n\ -jre-restrict-search | -no-jre-restrict-search\n\ \u30E6\u30FC\u30B6\u30FC\u306E\u30D7\u30E9\u30A4\u30D9\u30FC\u30C8JRE\u3092\u30D0\u30FC\u30B8\u30E7\u30F3\u691C\u7D22\u306B\u542B\u3081\u308B/\u9664\u5916\u3059\u308B\n\ -? -help \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3059\u308B\n\ -X \u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u95A2\u3059\u308B\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u3059\u308B\n\ -ea[:<packagename>...|:<classname>]\n\ -enableassertions[:<packagename>...|:<classname>]\n\ \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\n\ -da[:<packagename>...|:<classname>]\n\ -disableassertions[:<packagename>...|:<classname>]\n\ \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3059\u308B\n\ -esa | -enablesystemassertions\n\ \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\n\ -dsa | -disablesystemassertions\n\ \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3059\u308B\n\ -agentlib:<libname>[=<options>]\n\ \u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA<libname>\u3092\u30ED\u30FC\u30C9\u3059\u308B\u3002\u4F8B: -agentlib:hprof\n\ -agentlib:jdwp=help\u3068-agentlib:hprof=help\u3082\u53C2\u7167\n\ -agentpath:<pathname>[=<options>]\n\ \u30D5\u30EB\u30D1\u30B9\u540D\u3067\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u30ED\u30FC\u30C9\u3059\u308B\n\ -javaagent:<jarpath>[=<options>]\n\ Java\u30D7\u30ED\u30B0\u30E9\u30DF\u30F3\u30B0\u8A00\u8A9E\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092\u30ED\u30FC\u30C9\u3059\u308B\u3002java.lang.instrument\u3092\u53C2\u7167\n\ -splash:<imagepath>\n\ \u6307\u5B9A\u3057\u305F\u30A4\u30E1\u30FC\u30B8\u3067\u30B9\u30D7\u30E9\u30C3\u30B7\u30E5\u753B\u9762\u3092\u8868\u793A\u3059\u308B\n\u8A73\u7D30\u306Fhttp://java.sun.com/javase/reference\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
# Translators please note do not translate the options themselves
-java.launcher.X.usage=\ -Xmixed \u6df7\u5408\u30e2\u30fc\u30c9\u3067\u306e\u5b9f\u884c (\u30c7\u30d5\u30a9\u30eb\u30c8)\n\ -Xint \u30a4\u30f3\u30bf\u30fc\u30d7\u30ea\u30bf\u30e2\u30fc\u30c9\u3067\u306e\u307f\u5b9f\u884c\n\ -Xbootclasspath:<directories and zip/jar files separated by {0}>\n\ \u30d6\u30fc\u30c8\u30b9\u30c8\u30e9\u30c3\u30d7\u30af\u30e9\u30b9\u304a\u3088\u3073\u30ea\u30bd\u30fc\u30b9\u306e\u691c\u7d22\u30d1\u30b9\u3092\u8a2d\u5b9a\n\ -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n\ \u30d6\u30fc\u30c8\u30b9\u30c8\u30e9\u30c3\u30d7\u30af\u30e9\u30b9\u306e\u30d1\u30b9\u306e\u672b\u5c3e\u306b\u8ffd\u52a0\n\ -Xbootclasspath/p:<directories and zip/jar files separated by {0}>\n\ \u30d6\u30fc\u30c8\u30b9\u30c8\u30e9\u30c3\u30d7\u30af\u30e9\u30b9\u306e\u30d1\u30b9\u306e\u5192\u982d\u306b\u8ffd\u52a0\n\ -Xnoclassgc \u30af\u30e9\u30b9\u30ac\u30fc\u30d9\u30fc\u30b8\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u3092\u7121\u52b9\u5316\n\ -Xincgc \u5897\u5206\u30ac\u30fc\u30d9\u30fc\u30b8\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u3092\u7121\u52b9\u5316\n\ -Xloggc:<file> \u30d5\u30a1\u30a4\u30eb\u306e GC \u30b9\u30c6\u30fc\u30bf\u30b9\u3092\u30bf\u30a4\u30e0\u30b9\u30bf\u30f3\u30d7\u4ed8\u304d\u3067\u8a18\u9332\n\ -Xbatch \u30d0\u30c3\u30af\u30b0\u30e9\u30a6\u30f3\u30c9\u30b3\u30f3\u30d1\u30a4\u30eb\u3092\u7121\u52b9\u5316\n\ -Xms<size> \u521d\u671f Java \u30d2\u30fc\u30d7\u30b5\u30a4\u30ba\u3092\u8a2d\u5b9a\n\ -Xmx<size> \u6700\u5927 Java \u30d2\u30fc\u30d7\u30b5\u30a4\u30ba\u3092\u8a2d\u5b9a\n\ -Xss<size> Java \u30b9\u30ec\u30c3\u30c9\u30b9\u30bf\u30c3\u30af\u30b5\u30a4\u30ba\u3092\u8a2d\u5b9a\n\ -Xprof CPU \u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30c7\u30fc\u30bf\u3092\u51fa\u529b\n\ -Xfuture \u4eca\u5f8c\u30c7\u30d5\u30a9\u30eb\u30c8\u3068\u3059\u308b\u6700\u3082\u53b3\u683c\u306a\u30c1\u30a7\u30c3\u30af\u3092\u6709\u52b9\u5316\n\ -Xrs Java/VM \u306e OS \u30b7\u30b0\u30ca\u30eb\u4f7f\u7528\u3092\u524a\u6e1b (\u30de\u30cb\u30e5\u30a2\u30eb\u3092\u53c2\u7167)\n\ -Xcheck:jni JNI \u95a2\u6570\u306e\u8ffd\u52a0\u30c1\u30a7\u30c3\u30af\u3092\u5b9f\u884c\n\ -Xshare:off \u5171\u6709\u30af\u30e9\u30b9\u30c7\u30fc\u30bf\u306e\u4f7f\u7528\u3092\u8a66\u884c\u3057\u306a\u3044\n\ -Xshare:auto \u53ef\u80fd\u306a\u5834\u5408\u306f\u5171\u6709\u30af\u30e9\u30b9\u30c7\u30fc\u30bf\u3092\u4f7f\u7528 (\u30c7\u30d5\u30a9\u30eb\u30c8)\n\ -Xshare:on \u5171\u6709\u30af\u30e9\u30b9\u30c7\u30fc\u30bf\u306e\u4f7f\u7528\u3092\u8981\u6c42 (\u305d\u3046\u3057\u306a\u3044\u3068\u969c\u5bb3\u304c\u767a\u751f\u3059\u308b\u5834\u5408)\n\n-X \u30aa\u30d7\u30b7\u30e7\u30f3\u306f\u975e\u6a19\u6e96\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3067\u3042\u308a\u3001\u4e88\u544a\u306a\u304f\u5909\u66f4\u3055\u308c\u308b\u5834\u5408\u304c\u3042\u308a\u307e\u3059\u3002\n
+java.launcher.X.usage=\ -Xmixed \u6DF7\u5408\u30E2\u30FC\u30C9\u306E\u5B9F\u884C(\u30C7\u30D5\u30A9\u30EB\u30C8)\n\ -Xint \u30A4\u30F3\u30BF\u30D7\u30EA\u30BF\u30FB\u30E2\u30FC\u30C9\u306E\u5B9F\u884C\u306E\u307F\n\ -Xbootclasspath:<directories and zip/jar files separated by {0}>\n\ \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u306E\u30AF\u30E9\u30B9\u3068\u30EA\u30BD\u30FC\u30B9\u306E\u691C\u7D22\u30D1\u30B9\u3092\u8A2D\u5B9A\u3059\u308B\n\ -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n\ \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u6700\u5F8C\u306B\u8FFD\u52A0\u3059\u308B\n\ -Xbootclasspath/p:<directories and zip/jar files separated by {0}>\n\ \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u524D\u306B\u4ED8\u52A0\u3059\u308B\n\ -Xdiag \u8FFD\u52A0\u306E\u8A3A\u65AD\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3059\u308B\n\ -Xnoclassgc \u30AF\u30E9\u30B9\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3059\u308B\n\ -Xincgc \u5897\u5206\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\n\ -Xloggc:<file> \u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u4ED8\u3044\u305F\u30D5\u30A1\u30A4\u30EB\u306BGC\u30B9\u30C6\u30FC\u30BF\u30B9\u306E\u30ED\u30B0\u3092\u8A18\u9332\u3059\u308B\n\ -Xbatch \u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u7121\u52B9\u306B\u3059\u308B\n\ -Xms<size> Java\u306E\u521D\u671F\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3059\u308B\n\ -Xmx<size> Java\u306E\u6700\u5C0F\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3059\u308B\n\ -Xss<size> Java\u306E\u30B9\u30EC\u30C3\u30C9\u30FB\u30B9\u30BF\u30C3\u30AF\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3059\u308B\n\ -Xprof CPU\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB\u30FB\u30C7\u30FC\u30BF\u3092\u51FA\u529B\u3059\u308B\n\ -Xfuture \u5C06\u6765\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u898B\u8D8A\u3057\u3066\u3001\u6700\u3082\u53B3\u5BC6\u306A\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u306B\u3059\u308B\n\ -Xrs Java/VM\u306B\u3088\u308BOS\u30B7\u30B0\u30CA\u30EB\u306E\u4F7F\u7528\u3092\u524A\u6E1B\u3059\u308B(\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167)\n\ -Xcheck:jni JNI\u95A2\u6570\u306B\u5BFE\u3059\u308B\u8FFD\u52A0\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u5B9F\u884C\u3059\u308B\n\ -Xshare:off \u5171\u6709\u30AF\u30E9\u30B9\u306E\u30C7\u30FC\u30BF\u3092\u4F7F\u7528\u3057\u3088\u3046\u3068\u3057\u306A\u3044\n\ -Xshare:auto \u53EF\u80FD\u3067\u3042\u308C\u3070\u5171\u6709\u30AF\u30E9\u30B9\u306E\u30C7\u30FC\u30BF\u3092\u4F7F\u7528\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8)\n\ -Xshare:on \u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u5FC5\u9808\u306B\u3057\u3001\u3067\u304D\u306A\u3051\u308C\u3070\u5931\u6557\u3059\u308B\u3002\n\ -XshowSettings \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n\ -XshowSettings:all\n\ \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n\ -XshowSettings:vm \u3059\u3079\u3066\u306EVM\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n\ -XshowSettings:properties\n\ \u3059\u3079\u3066\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n\ -XshowSettings:locale\n\ \u3059\u3079\u3066\u306E\u30ED\u30B1\u30FC\u30EB\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n\n-X\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u6A19\u6E96\u306A\u306E\u3067\u3001\u4E88\u544A\u306A\u304F\u5909\u66F4\u3055\u308C\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002\n
-java.launcher.cls.error1=\u30a8\u30e9\u30fc: \u30e1\u30a4\u30f3\u30af\u30e9\u30b9 {0} \u3092\u691c\u51fa\u3067\u304d\u307e\u305b\u3093\u3002
-java.launcher.cls.error2=\u30a8\u30e9\u30fc: \u30af\u30e9\u30b9 {1} \u3067\u3001\u30e1\u30a4\u30f3\u30e1\u30bd\u30c3\u30c9\u304c {0} \u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u30e1\u30a4\u30f3\u30e1\u30bd\u30c3\u30c9\u3092\u6b21\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u3066\u304f\u3060\u3055\u3044:\n\ public static void main(String[] args)
-java.launcher.cls.error3=\u30a8\u30e9\u30fc: \u30af\u30e9\u30b9 {0} \u3067\u3001\u30e1\u30a4\u30f3\u30e1\u30bd\u30c3\u30c9\u306f void \u578b\u306e\u5024\u3092\u8fd4\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\n\u30e1\u30a4\u30f3\u30e1\u30bd\u30c3\u30c9\u3092\u6b21\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u3066\u304f\u3060\u3055\u3044:\n\ public static void main(String[] args)
-java.launcher.cls.error4=\u30a8\u30e9\u30fc: \u30af\u30e9\u30b9 {1} \u3067\u3001\u30e1\u30a4\u30f3\u30e1\u30bd\u30c3\u30c9\u3092\u691c\u51fa\u3067\u304d\u307e\u305b\u3093\u3002\u30e1\u30a4\u30f3\u30e1\u30bd\u30c3\u30c9\u3092\u6b21\u306e\u3088\u3046\u306b\u5b9a\u7fa9\u3057\u3066\u304f\u3060\u3055\u3044:\n\ public static void main(String[] args)
-
-
+java.launcher.cls.error1=\u30A8\u30E9\u30FC: \u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u3089\u306A\u304B\u3063\u305F\u304B\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
+java.launcher.cls.error2=\u30A8\u30E9\u30FC: \u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u304C\u30AF\u30E9\u30B9{1}\u306E{0}\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u6B21\u306E\u3088\u3046\u306B\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u3092\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\ public static void main(String[] args)
+java.launcher.cls.error3=\u30A8\u30E9\u30FC: \u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u306F\u30AF\u30E9\u30B9{0}\u306Evoid\u578B\u306E\u5024\u3092\u8FD4\u3059\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n\u6B21\u306E\u3088\u3046\u306B\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u3092\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\ public static void main(String[] args)
+java.launcher.cls.error4=\u30A8\u30E9\u30FC: \u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u304C\u30AF\u30E9\u30B9{0}\u3067\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u6B21\u306E\u3088\u3046\u306B\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u3092\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\ public static void main(String[] args)
+java.launcher.jar.error1=\u30A8\u30E9\u30FC: \u30D5\u30A1\u30A4\u30EB{0}\u3092\u958B\u3053\u3046\u3068\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u3001\u4E88\u671F\u3057\u306A\u3044\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
+java.launcher.jar.error2={0}\u306B\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+java.launcher.jar.error3={0}\u306B\u30E1\u30A4\u30F3\u30FB\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u5C5E\u6027\u304C\u3042\u308A\u307E\u305B\u3093
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties Mon Apr 11 16:19:20 2011 -0700
@@ -24,24 +24,25 @@
#
# Translators please note do not translate the options themselves
-java.launcher.opt.header = \uc0ac\uc6a9\ubc95: {0} [-options] class [args...]\n\ (\ud074\ub798\uc2a4 \uc2e4\ud589)\n \ub610\ub294 {0} [-options] -jar jarfile [args...]\n\ (jar \ud30c\uc77c \uc2e4\ud589)\n\uc635\uc158:\n
+java.launcher.opt.header = \uC0AC\uC6A9\uBC95: {0} [-options] class [args...]\n\ (\uD074\uB798\uC2A4 \uC2E4\uD589)\n \uB610\uB294 {0} [-options] -jar jarfile [args...]\n\ (jar \uD30C\uC77C \uC2E4\uD589)\n\uC5EC\uAE30\uC11C options\uB294 \uB2E4\uC74C\uACFC \uAC19\uC2B5\uB2C8\uB2E4.\n
-java.launcher.opt.datamodel =\ -d{0}\t \uc0ac\uc6a9 \uac00\ub2a5\ud55c \uacbd\uc6b0 {0}\ube44\ud2b8 \ub370\uc774\ud130 \ubaa8\ub378 \uc0ac\uc6a9\n
-java.launcher.opt.vmselect =\ {0}\t "{1}" VM \uc120\ud0dd \uc2dc\n
-java.launcher.opt.hotspot =\ {0}\t "{1}" VM[\ub354 \uc774\uc0c1 \uc0ac\uc6a9\ub418\uc9c0 \uc54a\uc74c]\uacfc \ub3d9\uc77c \n
+java.launcher.opt.datamodel =\ -d{0}\t \uC0AC\uC6A9 \uAC00\uB2A5\uD55C \uACBD\uC6B0 {0}\uBE44\uD2B8 \uB370\uC774\uD130 \uBAA8\uB378\uC744 \uC0AC\uC6A9\uD569\uB2C8\uB2E4.\n
+java.launcher.opt.vmselect =\ {0}\t "{1}" VM\uC744 \uC120\uD0DD\uD569\uB2C8\uB2E4.\n
+java.launcher.opt.hotspot =\ {0}\t "{1}" VM\uC758 \uB3D9\uC758\uC5B4\uC785\uB2C8\uB2E4[\uC0AC\uC6A9\uB418\uC9C0 \uC54A\uC74C].\n
-java.launcher.ergo.message1 =\ \uae30\ubcf8 VM\uc740 {0}\uc784
-java.launcher.ergo.message2 =\ \uadf8 \uc774\uc720\ub294 \uc11c\ubc84 \ud074\ub798\uc2a4 \uc2dc\uc2a4\ud15c\uc5d0\uc11c \uc2e4\ud589 \uc911\uc774\uae30 \ub54c\ubb38\uc785\ub2c8\ub2e4.\n
+java.launcher.ergo.message1 =\ \uAE30\uBCF8 VM\uC740 {0}\uC785\uB2C8\uB2E4.
+java.launcher.ergo.message2 =\ \uC11C\uBC84\uAE09 \uC2DC\uC2A4\uD15C\uC5D0\uC11C \uC2E4\uD589 \uC911\uC774\uAE30 \uB54C\uBB38\uC785\uB2C8\uB2E4.\n
# Translators please note do not translate the options themselves
-java.launcher.opt.footer =\ -cp <\ub514\ub809\ud1a0\ub9ac \ubc0f zip/jar \ud30c\uc77c\uc758 \ud074\ub798\uc2a4 \uac80\uc0c9 \uacbd\ub85c>\n\ -classpath <\ub514\ub809\ud1a0\ub9ac \ubc0f zip/jar \ud30c\uc77c\uc758 \ud074\ub798\uc2a4 \uac80\uc0c9 \uacbd\ub85c>\n\ \ud074\ub798\uc2a4 \ud30c\uc77c\uc744 \uac80\uc0c9\ud558\uae30 \uc704\ud55c \ub514\ub809\ud1a0\ub9ac, JAR \uc544\uce74\uc774\ube0c \ubc0f\n\ ZIP \uc544\uce74\uc774\ube0c\uc758 {0} \uad6c\ubd84\ub41c \ubaa9\ub85d\uc785\ub2c8\ub2e4.\n\ -D<name>=<value>\n\ \uc2dc\uc2a4\ud15c \ub4f1\ub85d \uc815\ubcf4 \uc124\uc815\n\ -verbose[:class|gc|jni]\n\ \ucd94\uac00 \ucd9c\ub825 \uc0ac\uc6a9\n\ -version \uc81c\ud488 \ubc84\uc804\uc744 \uc778\uc1c4\ud558\uace0 \uc885\ub8cc\n\ -version:<value>\n\ \uc2e4\ud589\ud558\ub824\uba74 \uc9c0\uc815\ud55c \ubc84\uc804 \ud544\uc694\n\ -showversion \uc81c\ud488 \ubc84\uc804\uc744 \uc778\uc1c4\ud558\uace0 \uacc4\uc18d\n\ -jre-restrict-search | -no-jre-restrict-search\n\ \ubc84\uc804 \uac80\uc0c9\uc5d0\uc11c \uc0ac\uc6a9\uc790 \uac1c\uc778 JRE \ud3ec\ud568/\uc81c\uc678\n\ -? -help \uc774 \ub3c4\uc6c0\ub9d0 \uba54\uc2dc\uc9c0 \uc778\uc1c4\n\ -X \ube44\ud45c\uc900 \uc635\uc158\uc5d0 \ub300\ud55c \ub3c4\uc6c0\ub9d0 \uc778\uc1c4\n\ -ea[:<packagename>...|:<classname>]\n\ -enableassertions[:<packagename>...|:<classname>]\n\ \uc9c0\uc815\ud55c \uc815\ubc00\ub3c4\uc758 \uba85\uc81c \uc0ac\uc6a9\n\ -da[:<packagename>...|:<classname>]\n\ -disableassertions[:<packagename>...|:<classname>]\n\ \uc9c0\uc815\ud55c \uc815\ubc00\ub3c4\uc758 \uba85\uc81c \uc0ac\uc6a9 \uc548 \ud568\n\ -esa | -enablesystemassertions\n\ \uc2dc\uc2a4\ud15c \uba85\uc81c \uc0ac\uc6a9\n\ -dsa | -disablesystemassertions\n\ \uc2dc\uc2a4\ud15c \uba85\uc81c \uc0ac\uc6a9 \uc548 \ud568\n\ -agentlib:<libname>[=<options>]\n\ \uc6d0\uc2dc \uc5d0\uc774\uc804\ud2b8 \ub77c\uc774\ube0c\ub7ec\ub9ac <libname> \ub85c\ub4dc, \uc608: -agentlib:hprof\n\ \ucc38\uc870: -agentlib:jdwp=help \ubc0f -agentlib:hprof=help\n\ -agentpath:<pathname>[=<options>]\n\ \uc804\uccb4 \uacbd\ub85c \uc774\ub984\uc73c\ub85c \uc6d0\uc2dc \uc5d0\uc774\uc804\ud2b8 \ub77c\uc774\ube0c\ub7ec\ub9ac \ub85c\ub4dc\n\ -javaagent:<jarpath>[=<options>]\n\ Java \ud504\ub85c\uadf8\ub798\ubc0d \uc5b8\uc5b4 \uc5d0\uc774\uc804\ud2b8 \ub85c\ub4dc, java.lang.instrument \ucc38\uc870\n\ -splash:<imagepath>\n\ \uc9c0\uc815\ud55c \uc774\ubbf8\uc9c0\uc758 \uc2a4\ud50c\ub798\uc2dc \ud654\uba74 \ud45c\uc2dc\n\uc790\uc138\ud55c \ub0b4\uc6a9\uc740 http://java.sun.com/javase/reference\ub97c \ucc38\uc870\ud558\uc2ed\uc2dc\uc624.
+java.launcher.opt.footer =\ -cp <class search path of directories and zip/jar files>\n\ -classpath <class search path of directories and zip/jar files>\n\ \uD074\uB798\uC2A4 \uD30C\uC77C\uC744 \uAC80\uC0C9\uD560 {0}(\uC73C)\uB85C \uAD6C\uBD84\uB41C \uB514\uB809\uD1A0\uB9AC,\n\ JAR \uC544\uCE74\uC774\uBE0C \uBC0F ZIP \uC544\uCE74\uC774\uBE0C \uBAA9\uB85D\uC785\uB2C8\uB2E4.\n\ -D<name>=<value>\n\ \uC2DC\uC2A4\uD15C \uC18D\uC131\uC744 \uC124\uC815\uD569\uB2C8\uB2E4.\n\ -verbose[:class|gc|jni]\n\ \uC0C1\uC138 \uC815\uBCF4 \uCD9C\uB825\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\ -version \uC81C\uD488 \uBC84\uC804\uC744 \uC778\uC1C4\uD55C \uD6C4 \uC885\uB8CC\uD569\uB2C8\uB2E4.\n\ -version:<value>\n\ \uC2E4\uD589\uD560 \uBC84\uC804\uC744 \uC9C0\uC815\uD574\uC57C \uD569\uB2C8\uB2E4.\n\ -showversion \uC81C\uD488 \uBC84\uC804\uC744 \uC778\uC1C4\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n\ -jre-restrict-search | -no-jre-restrict-search\n\ \uBC84\uC804 \uAC80\uC0C9\uC5D0\uC11C \uC0AC\uC6A9\uC790 \uC804\uC6A9 JRE\uB97C \uD3EC\uD568/\uC81C\uC678\uD569\uB2C8\uB2E4.\n\ -? -help \uC774 \uB3C4\uC6C0\uB9D0 \uBA54\uC2DC\uC9C0\uB97C \uC778\uC1C4\uD569\uB2C8\uB2E4.\n\ -X \uBE44\uD45C\uC900 \uC635\uC158\uC5D0 \uB300\uD55C \uB3C4\uC6C0\uB9D0\uC744 \uC778\uC1C4\uD569\uB2C8\uB2E4.\n\ -ea[:<packagename>...|:<classname>]\n\ -enableassertions[:<packagename>...|:<classname>]\n\ \uC138\uBD84\uC131\uC774 \uC9C0\uC815\uB41C \uAC80\uC99D\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\ -da[:<packagename>...|:<classname>]\n\ -disableassertions[:<packagename>...|:<classname>]\n\ \uC138\uBD84\uC131\uC774 \uC9C0\uC815\uB41C \uAC80\uC99D\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\ -esa | -enablesystemassertions\n\ \uC2DC\uC2A4\uD15C \uAC80\uC99D\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\ -dsa | -disablesystemassertions\n\ \uC2DC\uC2A4\uD15C \uAC80\uC99D\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\ -agentlib:<libname>[=<options>]\n\ <libname> \uACE0\uC720 \uC5D0\uC774\uC804\uD2B8 \uB77C\uC774\uBE0C\uB7EC\uB9AC\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4(\uC608: -agentlib:hprof).\n\ -agentlib:jdwp=help \uBC0F -agentlib:hprof=help\uB3C4 \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.\n\ -agentpath:<pathname>[=<options>]\n\ \uC804\uCCB4 \uACBD\uB85C\uBA85\uC744 \uC0AC\uC6A9\uD558\uC5EC \uACE0\uC720 \uC5D0\uC774\uC804\uD2B8 \uB77C\uC774\uBE0C\uB7EC\uB9AC\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4.\n\ -javaagent:<jarpath>[=<options>]\n\ Java \uD504\uB85C\uADF8\uB798\uBC0D \uC5B8\uC5B4 \uC5D0\uC774\uC804\uD2B8\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4. java.lang.instrument\uB97C \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.\n\ -splash:<imagepath>\n\ \uC774\uBBF8\uC9C0\uAC00 \uC9C0\uC815\uB41C \uC2A4\uD50C\uB798\uC2DC \uD654\uBA74\uC744 \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\uC790\uC138\uD55C \uB0B4\uC6A9\uC740 http://java.sun.com/javase/reference\uB97C \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.
# Translators please note do not translate the options themselves
-java.launcher.X.usage=\ -Xmixed \ud63c\ud569 \ubaa8\ub4dc \uc2e4\ud589(\uae30\ubcf8\uac12)\n\ -Xint \ud574\uc11d\ub41c \ubaa8\ub4dc \uc2e4\ud589 \uc804\uc6a9\n\ -Xbootclasspath:<directories and zip/jar files separated by {0}>\n\ \ubd80\ud2b8\uc2a4\ud2b8\ub7a9 \ud074\ub798\uc2a4\uc640 \uc790\uc6d0\uc758 \uac80\uc0c9 \uacbd\ub85c \uc124\uc815\n\ -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n\ \ubd80\ud2b8\uc2a4\ud2b8\ub7a9 \ud074\ub798\uc2a4 \uacbd\ub85c \ub05d\uc5d0 \ucd94\uac00\n\ -Xbootclasspath/p:<directories and zip/jar files separated by {0}>\n\ \ubd80\ud2b8\uc2a4\ud2b8\ub7a9 \ud074\ub798\uc2a4 \uacbd\ub85c \uc55e\uc5d0 \ucd94\uac00\n\ -Xnoclassgc \ud074\ub798\uc2a4 \uac00\ube44\uc9c0 \uceec\ub809\uc158 \uc0ac\uc6a9 \uc548 \ud568\n\ -Xincgc \uc99d\ubd84 \uac00\ube44\uc9c0 \uceec\ub809\uc158 \uc0ac\uc6a9\n\ -Xloggc:<file> GC \uc0c1\ud0dc\ub97c \ud0c0\uc784 \uc2a4\ud0ec\ud504\uc640 \ud568\uaed8 \ud30c\uc77c\uc5d0 \ub85c\uadf8\n\ -Xbatch \ubc31\uadf8\ub77c\uc6b4\ub4dc \ucef4\ud30c\uc77c \uc0ac\uc6a9 \uc548 \ud568\n\ -Xms<size> \ucd08\uae30 Java \ud799 \ud06c\uae30 \uc124\uc815\n\ -Xmx<size> \ucd5c\ub300 Java \ud799 \ud06c\uae30 \uc124\uc815\n\ -Xss<size> java \uc2a4\ub808\ub4dc \uc2a4\ud0dd \ud06c\uae30 \uc124\uc815\n\ -Xprof cpu \ud504\ub85c\ud30c\uc77c\ub9c1 \ub370\uc774\ud130 \ucd9c\ub825\n\ -Xfuture \ubbf8\ub798 \uae30\ubcf8\uac12\uc744 \uc608\uce21\ud558\uc5ec \uac00\uc7a5 \uc5c4\uaca9\ud55c \uac80\uc0ac \uc0ac\uc6a9\n\ -Xrs Java/VM\uc5d0 \uc758\ud55c OS \uc2e0\ud638 \uc0ac\uc6a9 \uac10\uc18c(\uc124\uba85\uc11c \ucc38\uc870)\n\ -Xcheck:jni JNI \uae30\ub2a5\uc5d0 \ub300\ud55c \ucd94\uac00\uc801\uc778 \uac80\uc0ac \uc218\ud589\n\ -Xshare:off \uacf5\uc720\ub41c \ud074\ub798\uc2a4 \ub370\uc774\ud130\uc758 \uc0ac\uc6a9\uc744 \uc2dc\ub3c4\ud558\uc9c0 \uc54a\uc74c\n\ -Xshare:auto \uac00\ub2a5\ud55c \uacbd\uc6b0 \uacf5\uc720\ub41c \ud074\ub798\uc2a4 \ub370\uc774\ud130 \uc0ac\uc6a9(\uae30\ubcf8\uac12)\n\ -Xshare:on \uacf5\uc720\ub41c \ud074\ub798\uc2a4 \ub370\uc774\ud130\ub97c \uc0ac\uc6a9\ud574\uc57c \ud558\uba70 \uadf8\ub807\uc9c0 \uc54a\uc73c\uba74 \uc2e4\ud328.\n\n-X \uc635\uc158\uc740 \ud45c\uc900\uc774 \uc544\ub2c8\uba70 \uc54c\ub9bc \uc5c6\uc774 \ubcc0\uacbd\ub420 \uc218 \uc788\uc2b5\ub2c8\ub2e4.\n
+java.launcher.X.usage=\ -Xmixed \uD63C\uD569 \uBAA8\uB4DC\uB97C \uC2E4\uD589\uD569\uB2C8\uB2E4(\uAE30\uBCF8\uAC12).\n\ -Xint \uD574\uC11D\uB41C \uBAA8\uB4DC\uB9CC \uC2E4\uD589\uD569\uB2C8\uB2E4.\n\ -Xbootclasspath:<directories and zip/jar files separated by {0}>\n\ \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uBC0F \uB9AC\uC18C\uC2A4\uC5D0 \uB300\uD55C \uAC80\uC0C9 \uACBD\uB85C\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n\ -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n\ \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uACBD\uB85C \uB05D\uC5D0 \uCD94\uAC00\uD569\uB2C8\uB2E4.\n\ -Xbootclasspath/p:<directories and zip/jar files separated by {0}>\n\ \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uACBD\uB85C \uC55E\uC5D0 \uCD94\uAC00\uD569\uB2C8\uB2E4.\n\ -Xdiag \uCD94\uAC00 \uC9C4\uB2E8 \uBA54\uC2DC\uC9C0\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\ -Xnoclassgc \uD074\uB798\uC2A4\uC758 \uBD88\uD544\uC694\uD55C \uC815\uBCF4 \uBAA8\uC74C\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\ -Xincgc \uC99D\uBD84\uC801\uC778 \uBD88\uD544\uC694\uD55C \uC815\uBCF4 \uBAA8\uC74C\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\ -Xloggc:<file> \uC2DC\uAC04 \uAE30\uB85D\uACFC \uD568\uAED8 \uD30C\uC77C\uC5D0 GC \uC0C1\uD0DC\uB97C \uAE30\uB85D\uD569\uB2C8\uB2E4.\n\ -Xbatch \uBC31\uADF8\uB77C\uC6B4\uB4DC \uCEF4\uD30C\uC77C\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\ -Xms<size> \uCD08\uAE30 Java \uD799 \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n\ -Xmx<size> \uCD5C\uB300 Java \uD799 \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n\ -Xss<size> Java \uC2A4\uB808\uB4DC \uC2A4\uD0DD \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n\ -Xprof CPU \uD504\uB85C\uD30C\uC77C \uC791\uC131 \uB370\uC774\uD130\uB97C \uCD9C\uB825\uD569\uB2C8\uB2E4.\n\ -Xfuture \uBBF8\uB798 \uAE30\uBCF8\uAC12\uC744 \uC608\uCE21\uD558\uC5EC \uAC00\uC7A5 \uC5C4\uACA9\uD55C \uAC80\uC0AC\uB97C \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\ -Xrs Java/VM\uC5D0 \uC758\uD55C OS \uC2E0\uD638 \uC0AC\uC6A9\uC744 \uC904\uC785\uB2C8\uB2E4(\uC124\uBA85\uC11C \uCC38\uC870).\n\ -Xcheck:jni JNI \uD568\uC218\uC5D0 \uB300\uD55C \uCD94\uAC00 \uAC80\uC0AC\uB97C \uC218\uD589\uD569\uB2C8\uB2E4.\n\ -Xshare:off \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130 \uC0AC\uC6A9\uC744 \uC2DC\uB3C4\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n\ -Xshare:auto \uAC00\uB2A5\uD55C \uACBD\uC6B0 \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130\uB97C \uC0AC\uC6A9\uD569\uB2C8\uB2E4(\uAE30\uBCF8\uAC12).\n\ -Xshare:on \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130\uB97C \uC0AC\uC6A9\uD574\uC57C \uD569\uB2C8\uB2E4. \uADF8\uB807\uC9C0 \uC54A\uC744 \uACBD\uC6B0 \uC2E4\uD328\uD569\uB2C8\uB2E4.\n\ -XshowSettings \uBAA8\uB4E0 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n\ -XshowSettings:all\n\ \uBAA8\uB4E0 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n\ -XshowSettings:vm \uBAA8\uB4E0 VM \uAD00\uB828 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n\ -XshowSettings:properties\n\ \uBAA8\uB4E0 \uC18D\uC131 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n\ -XshowSettings:locale\n\ \uBAA8\uB4E0 \uB85C\uCF00\uC77C \uAD00\uB828 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n\n-X \uC635\uC158\uC740 \uBE44\uD45C\uC900 \uC635\uC158\uC774\uBBC0\uB85C \uD1B5\uC9C0 \uC5C6\uC774 \uBCC0\uACBD\uB420 \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n
-java.launcher.cls.error1=\uc624\ub958: \uae30\ubcf8 \ud074\ub798\uc2a4 {0}\uc744(\ub97c) \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-java.launcher.cls.error2=\uc624\ub958: \ud575\uc2ec \uba54\uc18c\ub4dc\uac00 \ud074\ub798\uc2a4 {1}\uc758 {0}\uc774(\uac00) \uc544\ub2d9\ub2c8\ub2e4. \ud575\uc2ec \uba54\uc18c\ub4dc\ub97c \ub2e4\uc74c\uacfc \uac19\uc774 \uc815\uc758\ud558\uc2ed\uc2dc\uc624.\n\ public static void main(String[] args)
-java.launcher.cls.error3=\uc624\ub958: \ud575\uc2ec \uba54\uc18c\ub4dc\ub294 \ud074\ub798\uc2a4 {0}\uc758 void \uc720\ud615\uc758 \uac12\uc744 \ubc18\ud658\ud574\uc57c \ud569\ub2c8\ub2e4.\n\ud575\uc2ec \uba54\uc18c\ub4dc\ub97c \ub2e4\uc74c\uacfc \uac19\uc774 \uc815\uc758\ud558\uc2ed\uc2dc\uc624.\n\ public static void main(String[] args)
-java.launcher.cls.error4=\uc624\ub958: \ud575\uc2ec \uba54\uc18c\ub4dc\ub97c \ud074\ub798\uc2a4 {0}\uc5d0\uc11c \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ud575\uc2ec \uba54\uc18c\ub4dc\ub97c \ub2e4\uc74c\uacfc \uac19\uc774 \uc815\uc758\ud558\uc2ed\uc2dc\uc624.\n\ public static void main(String[] args)
-
-
+java.launcher.cls.error1=\uC624\uB958: \uAE30\uBCF8 \uD074\uB798\uC2A4 {0}\uC744(\uB97C) \uCC3E\uAC70\uB098 \uB85C\uB4DC\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+java.launcher.cls.error2=\uC624\uB958: {1} \uD074\uB798\uC2A4\uC5D0\uC11C \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uAC00 {0}\uC774(\uAC00) \uC544\uB2D9\uB2C8\uB2E4. \uB2E4\uC74C \uD615\uC2DD\uC73C\uB85C \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uB97C \uC815\uC758\uD558\uC2ED\uC2DC\uC624.\n\ public static void main(String[] args)
+java.launcher.cls.error3=\uC624\uB958: \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uB294 {0} \uD074\uB798\uC2A4\uC5D0\uC11C void \uC720\uD615\uC758 \uAC12\uC744 \uBC18\uD658\uD574\uC57C \uD569\uB2C8\uB2E4. \n\uB2E4\uC74C \uD615\uC2DD\uC73C\uB85C \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uB97C \uC815\uC758\uD558\uC2ED\uC2DC\uC624.\n\ public static void main(String[] args)
+java.launcher.cls.error4=\uC624\uB958: {0} \uD074\uB798\uC2A4\uC5D0\uC11C \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uB2E4\uC74C \uD615\uC2DD\uC73C\uB85C \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uB97C \uC815\uC758\uD558\uC2ED\uC2DC\uC624.\n\ public static void main(String[] args)
+java.launcher.jar.error1=\uC624\uB958: {0} \uD30C\uC77C\uC744 \uC5F4\uB824\uACE0 \uC2DC\uB3C4\uD558\uB294 \uC911 \uC608\uC0C1\uCE58 \uC54A\uC740 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
+java.launcher.jar.error2={0}\uC5D0\uC11C Manifest\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+java.launcher.jar.error3={0}\uC5D0 \uAE30\uBCF8 Manifest \uC18D\uC131\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties Mon Apr 11 16:19:20 2011 -0700
@@ -24,93 +24,25 @@
#
# Translators please note do not translate the options themselves
-java.launcher.opt.header = Usage: {0} [-options] class [args...]\n\
-\ (to execute a class)\n or {0} [-options] -jar jarfile [args...]\n\
-\ (to execute a jar file)\n\
-where options include:\n
+java.launcher.opt.header = Uso: {0} [-options] class [args...]\n\ (para executar uma classe)\n ou {0} [-options] -jar jarfile [args...]\n\ (para executar um arquivo jar)\nem que as op\u00E7\u00F5es incluem:\n
-java.launcher.opt.datamodel =\ -d{0}\t use a {0}-bit data model if available\n
-java.launcher.opt.vmselect =\ {0}\t to select the "{1}" VM\n
-java.launcher.opt.hotspot =\ {0}\t is a synonym for the "{1}" VM [deprecated]\n
+java.launcher.opt.datamodel =\ -d{0}\t usar um modelo de dados de {0} bits, se estiver dispon\u00EDvel\n
+java.launcher.opt.vmselect =\ {0}\t para selecionar a VM "{1}"\n
+java.launcher.opt.hotspot =\ {0}\t \u00E9 um sin\u00F4nimo da VM "{1}" [obsoleto]\n
-java.launcher.ergo.message1 =\ The default VM is {0}
-java.launcher.ergo.message2 =\ because you are running on a server-class machine.\n
+java.launcher.ergo.message1 =\ A VM default \u00E9 {0}
+java.launcher.ergo.message2 =\ porque a execu\u00E7\u00E3o est\u00E1 sendo feita em uma m\u00E1quina de classe de servidor.\n
# Translators please note do not translate the options themselves
-java.launcher.opt.footer =\ -cp <class search path of directories and zip/jar files>\n\
-\ -classpath <class search path of directories and zip/jar files>\n\
-\ A {0} separated list of directories, JAR archives,\n\
-\ and ZIP archives to search for class files.\n\
-\ -D<name>=<value>\n\
-\ set a system property\n\
-\ -verbose[:class|gc|jni]\n\
-\ enable verbose output\n\
-\ -version print product version and exit\n\
-\ -version:<value>\n\
-\ require the specified version to run\n\
-\ -showversion print product version and continue\n\
-\ -jre-restrict-search | -no-jre-restrict-search\n\
-\ include/exclude user private JREs in the version search\n\
-\ -? -help print this help message\n\
-\ -X print help on non-standard options\n\
-\ -ea[:<packagename>...|:<classname>]\n\
-\ -enableassertions[:<packagename>...|:<classname>]\n\
-\ enable assertions with specified granularity\n\
-\ -da[:<packagename>...|:<classname>]\n\
-\ -disableassertions[:<packagename>...|:<classname>]\n\
-\ disable assertions with specified granularity\n\
-\ -esa | -enablesystemassertions\n\
-\ enable system assertions\n\
-\ -dsa | -disablesystemassertions\n\
-\ disable system assertions\n\
-\ -agentlib:<libname>[=<options>]\n\
-\ load native agent library <libname>, e.g. -agentlib:hprof\n\
-\ see also, -agentlib:jdwp=help and -agentlib:hprof=help\n\
-\ -agentpath:<pathname>[=<options>]\n\
-\ load native agent library by full pathname\n\
-\ -javaagent:<jarpath>[=<options>]\n\
-\ load Java programming language agent, see java.lang.instrument\n\
-\ -splash:<imagepath>\n\
-\ show splash screen with specified image\n\
-See http://java.sun.com/javase/reference for more details.
+java.launcher.opt.footer =\ -cp <caminho de pesquisa da classe dos diret\u00F3rios e arquivos zip/jar>\n\ -classpath <caminho de pesquisa da classe dos diret\u00F3rios e arquivos zip/jar>\n\ Uma lista separada por {0} de diret\u00F3rios, archives JAR\n\ e archives ZIP nos quais ser\u00E3o procurados os arquivos de classe.\n\ -D<nome>=<valor>\n\ define uma propriedade do sistema\n\ -verbose[:classe|gc|jni]\n\ ativa a sa\u00EDda detalhada\n\ -version imprime a vers\u00E3o do produto e sai do programa\n\ -version:<valor>\n\ requer a execu\u00E7\u00E3o da vers\u00E3o especificada\n\ -showversion imprime a vers\u00E3o do produto e continua\n\ -jre-restrict-search | -no-jre-restrict-search\n\ inclui/exclui JREs privados do usu\u00E1rio na pesquisa de vers\u00E3o\n\ -? -help imprime esta mensagem de ajuda\n\ -X imprime a ajuda sobre op\u00E7\u00F5es n\u00E3o padronizadas\n\ -ea[:<nome do pacote>...|:<nome da classe>]\n\ -enableassertions[:<nome do pacote>...|:<nome da classe>]\n\ ativa asser\u00E7\u00F5es com granularidade especificada\n\ -da[:<nome do pacote>...|:<nome da classe>]\n\ -disableassertions[:<nome do pacote>...|:<nome da classe>]\n\ desativa asser\u00E7\u00F5es com granularidade especificada\n\ -esa | -enablesystemassertions\n\ ativa asser\u00E7\u00F5es do sistema\n\ -dsa | -disablesystemassertions\n\ desativa asser\u00E7\u00F5es do sistema\n\ -agentlib:<nome da biblioteca>[=<op\u00E7\u00F5es>]\n\ carrega a biblioteca de agentes nativa <nome da biblioteca>, por exempl: -agentlib:hprof\n\ consulte tamb\u00E9m: -agentlib:jdwp=help e -agentlib:hprof=help\n\ -agentpath:<nome do caminho>[=<op\u00E7\u00F5es>]\n\ carrega a biblioteca de agentes nativa com base no nome do caminho completo\n\ -javaagent:<caminho do arquivo jar>[=<op\u00E7\u00F5es>]\n\ carrega o agente da linguagem de programa\u00E7\u00E3o Java; consulte java.lang.instrument\n\ -splash:<caminho da imagem>\n\ mostra a tela de abertura com a imagem especificada\nConsulte http://java.sun.com/javase/reference para obter mais detalhes.
# Translators please note do not translate the options themselves
-java.launcher.X.usage=\
-\ -Xmixed mixed mode execution (default)\n\
-\ -Xint interpreted mode execution only\n\
-\ -Xbootclasspath:<directories and zip/jar files separated by {0}>\n\
-\ set search path for bootstrap classes and resources\n\
-\ -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n\
-\ append to end of bootstrap class path\n\
-\ -Xbootclasspath/p:<directories and zip/jar files separated by {0}>\n\
-\ prepend in front of bootstrap class path\n\
-\ -Xnoclassgc disable class garbage collection\n\
-\ -Xincgc enable incremental garbage collection\n\
-\ -Xloggc:<file> log GC status to a file with time stamps\n\
-\ -Xbatch disable background compilation\n\
-\ -Xms<size> set initial Java heap size\n\
-\ -Xmx<size> set maximum Java heap size\n\
-\ -Xss<size> set java thread stack size\n\
-\ -Xprof output cpu profiling data\n\
-\ -Xfuture enable strictest checks, anticipating future default\n\
-\ -Xrs reduce use of OS signals by Java/VM (see documentation)\n\
-\ -Xcheck:jni perform additional checks for JNI functions\n\
-\ -Xshare:off do not attempt to use shared class data\n\
-\ -Xshare:auto use shared class data if possible (default)\n\
-\ -Xshare:on require using shared class data, otherwise fail.\n\n\
-The -X options are non-standard and subject to change without notice.\n
+java.launcher.X.usage=\ -Xmixed execu\u00E7\u00E3o no modo misto (default)\n\ -Xint execu\u00E7\u00E3o somente no modo interpretado\n\ -Xbootclasspath:<diret\u00F3rios e arquivos zip/jar separados por {0}>\n\ define o caminho de pesquisa para classes e recursos de inicializa\u00E7\u00E3o\n\ -Xbootclasspath/a:<diret\u00F3rios e arquivos zip/jar separados por {0}>\n\ anexa no final do caminho da classe de inicializa\u00E7\u00E3o\n\ -Xbootclasspath/p:<diret\u00F3rios e arquivos zip/jar separados por {0}>\n\ anexa no in\u00EDcio do caminho da classe de inicializa\u00E7\u00E3o\n\ -Xdiag mostra mensagens de diagn\u00F3stico adicionais\n\ -Xnoclassgc desativa a coleta de lixo da classe\n\ -Xincgc ativa a coleta de lixo incremental\n\ -Xloggc:<arquivo> registra o status do GC status em um arquivo com marca\u00E7\u00F5es de data e hor\u00E1rio\n\ -Xbatch desativa a compila\u00E7\u00E3o em segundo plano\n\ -Xms<tamanho> define o tamanho inicial do heap Java\n\ -Xmx<tamanho> define o tamanho m\u00E1ximo do heap Java\n\ -Xss<tamanho> define o tamanho da pilha de threads java\n\ -Xprof produz dados de perfil da cpu\n\ -Xfuture ativa verifica\u00E7\u00F5es de n\u00EDvel m\u00E1ximo de exig\u00EAncia, prevendo o valor default futuro\n\ -Xrs reduz o uso de sinais do SO pelo(a) Java/VM (consulte a documenta\u00E7\u00E3o)\n\ -Xcheck:jni executa verifica\u00E7\u00F5es adicionais de fun\u00E7\u00F5es da JNI\n\ -Xshare:off n\u00E3o tenta usar dados da classe compartilhada\n\ -Xshare:auto se poss\u00EDvel, usa dados da classe compartilhada (default)\n\ -Xshare:on requer o uso de dados da classe compartilhada, caso contr\u00E1rio haver\u00E1 falha.\n\ -XshowSettings mostra todas as defini\u00E7\u00F5es e continua\n\ -XshowSettings:all\n\ mostra todas as defini\u00E7\u00F5es e continua\n\ -XshowSettings:vm mostra todas as defini\u00E7\u00F5es relacionadas \u00E0 vm e continua\n\ -XshowSettings:properties\n\ mostra todas as defini\u00E7\u00F5es da propriedade e continua\n\ -XshowSettings:locale\n\ mostra todas as defini\u00E7\u00F5es relativas \u00E0s configura\u00E7\u00F5es regionais e continua\n\nAs -X options n\u00E3o s\u00E3o padronizadas e est\u00E3o sujeitas a altera\u00E7\u00F5es sem aviso.\n
-java.launcher.cls.error1=\
- Error: Could not find main class {0}
-java.launcher.cls.error2=\
- Error: Main method is not {0} in class {1}, please define the main method as:\n\
-\ public static void main(String[] args)
-java.launcher.cls.error3=\
- Error: Main method must return a value of type void in class {0}, please \n\
- define the main method as:\n\
-\ public static void main(String[] args)
-java.launcher.cls.error4=\
- Error: Main method not found in class {0}, please define the main method as:\n\
-\ public static void main(String[] args)
-
-
+java.launcher.cls.error1=Erro: N\u00E3o foi poss\u00EDvel localizar nem carregar a classe principal {0}
+java.launcher.cls.error2=Erro: O m\u00E9todo principal n\u00E3o \u00E9 {0} na classe {1}; defina o m\u00E9todo principal como:\n\ public static void main(String[] args)
+java.launcher.cls.error3=Erro: O m\u00E9todo principal deve retornar um valor do tipo void na classe {0}; \ndefina o m\u00E9todo principal como:\n\ public static void main(String[] args)
+java.launcher.cls.error4=Erro: O m\u00E9todo principal n\u00E3o foi encontrado na classe {0}; defina o m\u00E9todo principal como:\n\ public static void main(String[] args)
+java.launcher.jar.error1=Erro: ocorreu um erro inesperado ao tentar abrir o arquivo {0}
+java.launcher.jar.error2=manifesto n\u00E3o encontrado em {0}
+java.launcher.jar.error3=nenhum atributo de manifesto principal em {0}
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_sv.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_sv.properties Mon Apr 11 16:19:20 2011 -0700
@@ -24,24 +24,25 @@
#
# Translators please note do not translate the options themselves
-java.launcher.opt.header = Anv\u00e4ndning: {0} [-alternativ] class [arg...]\n\ (f\u00f6r att k\u00f6ra en klass)\n or {0} [-alternativ] -jar jarfile [arg...]\n\ (f\u00f6r att k\u00f6ra en jar-fil)\nbland alternativen kan n\u00e4mnas:\n
+java.launcher.opt.header = Syntax: {0} [-options] class [args...]\n\ (f\u00F6r att k\u00F6ra en klass)\n eller {0} [-options] -jar jarfile [args...]\n\ (f\u00F6r att k\u00F6ra en jar-fil)\nd\u00E4r alternativen omfattar:\n
-java.launcher.opt.datamodel =\ -d{0}\t anv\u00e4nd en {0}-bitars datamodell om den finns tillg\u00e4nglig\n
-java.launcher.opt.vmselect =\ {0}\t f\u00f6r att v\u00e4lja "{1}" VM\n
-java.launcher.opt.hotspot =\ {0}\t \u00e4r liktydigt med "{1}"-VM [utfasad]\n
+java.launcher.opt.datamodel =\ -d{0}\t anv\u00E4nd en {0}-bitsdatamodell om det finns\n
+java.launcher.opt.vmselect =\ {0}\t f\u00F6r att v\u00E4lja "{1}" VM\n
+java.launcher.opt.hotspot =\ {0}\t \u00E4r en synonym f\u00F6r "{1}" VM [deprecated]\n
-java.launcher.ergo.message1 =\ Standard-VM \u00e4r {0}
-java.launcher.ergo.message2 =\ eftersom du k\u00f6r p\u00e5 en dator med server-klass.\n
+java.launcher.ergo.message1 =\ Standard-VM \u00E4r {0}
+java.launcher.ergo.message2 =\ eftersom du k\u00F6r en serverklassmaskin.\n
# Translators please note do not translate the options themselves
-java.launcher.opt.footer =\ -cp <klass\u00f6kv\u00e4g till kataloger och zip-/jar-filers>\n\ -classpath <klass\u00f6kv\u00e4g till kataloger och zip-/jar-filer>\n\ en med {0} avgr\u00e4nsad lista \u00f6ver kataloger, JAR-arkiv\n\ och ZIP-arkiv f\u00f6r s\u00f6kning efter klassfiler.\n\ -D<namn>=<v\u00e4rde>\n\ ange en systemegenskap\n\ -verbose[:klass|gc|jni]\n\ visa mer text\n\ -version skriv ut produktversionen och avsluta\n\ -version:<value>\n\ kr\u00e4ver den angivna versionen f\u00f6r att kunna k\u00f6ras\n\ -showversion skriv ut produktversion och forts\u00e4tt\n\ -jre-restrict-search | -no-jre-restrict-search\n\ inkludera/exkludera anv\u00e4ndarens privata JRE-filer i versionss\u00f6kningen\n\ -? -help skriver ut det h\u00e4r hj\u00e4lpmeddelandet\n\ -X skriv ut hj\u00e4lp f\u00f6r alternativ som inte \u00e4r standard\n\ -ea[:<paketnamn>...|:<klassnamn>]\n\ -enableassertions[:<paketnamn>...|:<klassnamn>]\n\ aktivera bekr\u00e4ftelser med angiven precision\n\ -da[:<paketnamn>...|:<klassnamn>]\n\ -disableassertions[:<paketnamn>...|:<klassnamn>]\n\ inaktivera bekr\u00e4ftelser med angiven precision\n\ -esa | -enablesystemassertions\n\ aktivera systembekr\u00e4ftelser\n\ -dsa | -disablesystemassertions\n\ inaktivera systembekr\u00e4ftelser\n\ -agentlib:<biblnamn>[=<alternativ>]\n\ l\u00e4s in det interna agentbiblioteket <biblnamn>, t.ex. -agentlib:hprof\n\ se \u00e4ven, -agentlib:jdwp=help och -agentlib:hprof=help\n\ -agentpath:<filnamn>[=<alternativ>]\n\ l\u00e4s in internt agentbibliotek utifr\u00e5n fullst\u00e4ndig s\u00f6kv\u00e4g\n\ -javaagent:<jar-s\u00f6kv\u00e4g>[=<alternativ>]\n\ l\u00e4s in agenten f\u00f6r programmeringsspr\u00e5ket Java, se java.lang.instrument\n\ -splash:<bilds\u00f6kv\u00e4g>\n\ visa v\u00e4lkomstf\u00f6nster med angiven bild\nMer information finns p\u00e5 http://java.sun.com/javase/reference.
+java.launcher.opt.footer =\ -cp <klass\u00F6kv\u00E4g f\u00F6r kataloger och zip-/jar-filer>\n\ -classpath <klass\u00F6kv\u00E4g f\u00F6r kataloger och zip-/jar-filer>\n\ En {0}-separerad lista med kataloger, JAR-arkiv,\n\ och ZIP-arkiv f\u00F6r s\u00F6kning efter klassfiler.\n\ -D<name>=<value>\n\ ange en systemegenskap\n\ -verbose[:class|gc|jni]\n\ aktivera utf\u00F6rliga utdata\n\ -version skriv ut produktversionen och avsluta\n\ -version:<value>\n\ beg\u00E4r den specifika versionen som ska k\u00F6ras\n\ -showversion skriv ut produktversionen och forts\u00E4tt\n\ -jre-restrict-search | -no-jre-restrict-search\n\ inkludera/exkludera anv\u00E4ndarprivata JRE:er i versions\u00F6kningen\n\ -? -help skriv ut det h\u00E4r hj\u00E4lpmeddelandet\n\ -X skriv ut hj\u00E4lp f\u00F6r icke-standardalternativ\n\ -ea[:<packagename>...|:<classname>]\n\ -enableassertions[:<packagename>...|:<classname>]\n\ aktivera verifiering med angiven detaljgrad\n\ -da[:<packagename>...|:<classname>]\n\ -disableassertions[:<packagename>...|:<classname>]\n\ avaktivera verifiering med angiven detaljgrad\n\ -esa | -enablesystemassertions\n\ aktivera systemverifieringar\n\ -dsa | -disablesystemassertions\n\ avaktivera systemverifieringar\n\ -agentlib:<libname>[=<options>]\n\ ladda ursprungligt agentbibliotek <libname>, e.g. -agentlib:hprof\n\ se \u00E4ven -agentlib:jdwp=help och -agentlib:hprof=help\n\ -agentpath:<pathname>[=<options>]\n\ ladda ursprungligt agentbibliotek med helt s\u00F6kv\u00E4gsnamn\n\ -javaagent:<jarpath>[=<options>]\n\ ladda Java-programspr\u00E5ksagent, se java.lang.instrument\n\ -splash:<imagepath>\n\ visa v\u00E4lkomstsk\u00E4rm med angiven bild\nMer information finns p\u00E5 http://java.sun.com/javase/reference.
# Translators please note do not translate the options themselves
-java.launcher.X.usage=\ -Xmixed k\u00f6rning i blandat l\u00e4ge (standard)\n\ -Xint endast k\u00f6rning i tolkat l\u00e4ge\n\ -Xbootclasspath:<kataloger och zip-/jar-filer som avgr\u00e4nsas med {0}>\n\ ange s\u00f6kv\u00e4g f\u00f6r bootstrap-klasser och -resurser\n\ -Xbootclasspath/a:<kataloger och zip-/jar-filer som avgr\u00e4nsas med {0}>\n\ l\u00e4gg till p\u00e5 slutet av s\u00f6kv\u00e4gen till bootstrap-klassen\n\ -Xbootclasspath/p:<kataloger och zip-/jar-filer som avgr\u00e4nsas med {0}>\n\ l\u00e4gg till i b\u00f6rjan av s\u00f6kv\u00e4gen till bootstrap-klassen\n\ -Xnoclassgc inaktivera skr\u00e4pinsamling f\u00f6r klass\n\ -Xincgc aktivera inkrementell skr\u00e4pinsaming\n\ -Xloggc:<file> logga GC-status till en fil med tidsst\u00e4mpel\n\ -Xbatch inaktivera kompilering i bakgrunden\n\ -Xms<size> st\u00e4ll in ursprunglig heapstorlek f\u00f6r Java\n\ -Xmx<size> st\u00e4ll in st\u00f6rsta heapstorlek f\u00f6r Java\n\ -Xss<size> st\u00e4ll in tr\u00e5dstackens storlek f\u00f6r Java\n\ -Xprof visa profileringsdata om processorn\n\ -Xfuture aktivera de mest rigor\u00f6sa kontrollerna och f\u00f6regrip framtida standardl\u00e4ge\n\ -Xrs minska anv\u00e4ndningen av signaler fr\u00e5n operativsystemet i Java/VM (mer information finns i dokumentationen)\n\ -Xcheck:jni utf\u00f6r ytterligare kontroller f\u00f6r JNI-funktioner\n\ -Xshare:off f\u00f6rs\u00f6k inte att anv\u00e4nda delade klassdata\n\ -Xshare:auto anv\u00e4nd om m\u00f6jligt delade klassdata (standard)\n\ -Xshare:on kr\u00e4v att delade klassdata anv\u00e4nds, skicka fel om s\u00e5 inte \u00e4r fallet.\n\n -X-alternativen betraktas inte som standard och kan \u00e4ndras utan att detta meddelas.\n
+java.launcher.X.usage=\ -Xmixed k\u00F6rning i blandat l\u00E4ge (standard)\n\ -Xint endast k\u00F6rning i tolkat l\u00E4ge\n\ -Xbootclasspath:<kataloger och zip-/jar-filer separeras med {0}>\n\ ange s\u00F6kv\u00E4g f\u00F6r programladdningsklasser och -resurser\n\ -Xbootclasspath/a:<kataloger och zip-/jar-filer separeras med {0}>\n\ l\u00E4gg till i slutet av programladdningsklassens s\u00F6kv\u00E4g\n\ -Xbootclasspath/p:<kataloger och zip-/jar-filer separeras med {0}>\n\ l\u00E4gg till i b\u00F6rjan av programladdningsklassens s\u00F6kv\u00E4g\n\ -Xdiag visa ytterligare diagnostiska meddelanden\n\ -Xnoclassgc avaktivera klassens skr\u00E4pinsamling\n\ -Xincgc aktivera inkrementell skr\u00E4pinsamling\n\ -Xloggc:<file> logga GC-status till en fil med tidsst\u00E4mplar\n\ -Xbatch avaktivera bakgrundskompilering\n\ -Xms<size> ange initial storlek f\u00F6r Java-heap\n\ -Xmx<size> ange maximal storlek f\u00F6r Java-heap\n\ -Xss<size> ange storlek f\u00F6r java-tr\u00E5dsstack\n\ -Xprof utdata f\u00F6r processorprofilering\n\ -Xfuture aktivera str\u00E4ngaste kontroller, f\u00F6rv\u00E4ntad framtida standard\n\ -Xrs minska OS-signalanv\u00E4ndning av Java/VM (se dokumentation)\n\ -Xcheck:jni utf\u00F6r ytterligare kontroller f\u00F6r JNI-funktioner\n\ -Xshare:off anv\u00E4nd inte delad klassdata\n\ -Xshare:auto anv\u00E4nd delad klassdata om det g\u00E5r (standard)\n\ -Xshare:on kr\u00E4v att delad klassdata anv\u00E4nds, annars slutf\u00F6rs inte.\n\ -XshowSettings visa alla inst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:all\n\ visa alla inst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:vm visa alla vm-relaterade inst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:properties\n\ visa alla egenskapsinst\u00E4llningar och forts\u00E4tt\n\ -XshowSettings:locale\n\ visa alla spr\u00E5krelaterade inst\u00E4llningar och forts\u00E4tt\n\n-X-alternativen \u00E4r inte standard och kan \u00E4ndras utan f\u00F6reg\u00E5ende meddelande.\n
-java.launcher.cls.error1=Fel: Det g\u00e5r inte att hitta klassen main {0}
-java.launcher.cls.error2=Fel: Metoden i main \u00e4r inte {0} i klass {1}. Ange huvudmetoden som:\n\ public static void main(String[] args)
-java.launcher.cls.error3=Fel: Metoden i main m\u00e5ste returnera ett v\u00e4rde av typen void i klass {0}. Definiera \nmetoden i main som:\n\ public static void main(String[] args)
-java.launcher.cls.error4=Fel: Klass {0} saknar metod i main. Definiera metoden som:\n\ public static void main(String[] args)
-
-
+java.launcher.cls.error1=Fel: Hittar inte eller kan inte ladda huvudklassen {0}
+java.launcher.cls.error2=Fel: Huvudmetoden \u00E4r inte {0} i klassen {1}, definiera huvudmetoden som:\n\ public static void main(String[] args)
+java.launcher.cls.error3=Fel: Huvudmetoden m\u00E5ste returnera ett v\u00E4rde av typen void i klassen {0}, \ndefiniera huvudmetoden som:\n\ public static void main(String[] args)
+java.launcher.cls.error4=Fel: Huvudmetoden finns inte i klassen {0}, definiera huvudmetoden som:\n\ public static void main(String[] args)
+java.launcher.jar.error1=Fel: Ett ov\u00E4ntat fel intr\u00E4ffade n\u00E4r filen {0} skulle \u00F6ppnas
+java.launcher.jar.error2=manifest finns inte i {0}
+java.launcher.jar.error3=inget huvudmanifestattribut i {0}
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_zh_CN.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_zh_CN.properties Mon Apr 11 16:19:20 2011 -0700
@@ -24,24 +24,25 @@
#
# Translators please note do not translate the options themselves
-java.launcher.opt.header = \u7528\u6cd5\uff1a{0} [-\u9009\u9879] class [\u53c2\u6570...]\n\ \uff08\u6267\u884c\u4e00\u4e2a\u7c7b\uff09\n \u6216 {0} [-\u9009\u9879] -jar jarfile [\u53c2\u6570...]\n\ \uff08\u6267\u884c\u4e00\u4e2a jar \u6587\u4ef6\uff09\n\u5176\u4e2d\uff0c\u9009\u9879\u5305\u62ec\uff1a\n
+java.launcher.opt.header = \u7528\u6CD5: {0} [-options] class [args...]\n\ (\u6267\u884C\u7C7B)\n \u6216 {0} [-options] -jar jarfile [args...]\n\ (\u6267\u884C jar \u6587\u4EF6)\n\u5176\u4E2D\u9009\u9879\u5305\u62EC:\n
-java.launcher.opt.datamodel =\ -d{0}\t \u4f7f\u7528\u4e00\u4e2a {0} \u4f4d\u6570\u636e\u6a21\u578b\uff08\u5982\u679c\u53ef\u7528\uff09\n
-java.launcher.opt.vmselect =\ {0}\t \u9009\u62e9 "{1}" VM\n
-java.launcher.opt.hotspot =\ {0}\t \u4e3a "{1}" VM \u7684\u540c\u4e49\u8bcd [\u5df2\u8fc7\u65f6]\n
+java.launcher.opt.datamodel =\ -d{0}\t \u4F7F\u7528 {0} \u4F4D\u6570\u636E\u6A21\u578B (\u5982\u679C\u53EF\u7528)\n
+java.launcher.opt.vmselect =\ {0}\t \u9009\u62E9 "{1}" VM\n
+java.launcher.opt.hotspot =\ {0}\t \u662F "{1}" VM \u7684\u540C\u4E49\u8BCD [\u5DF2\u8FC7\u65F6]\n
-java.launcher.ergo.message1 =\ \u9ed8\u8ba4\u7684 VM \u4e3a {0}
-java.launcher.ergo.message2 =\ \u56e0\u4e3a\u60a8\u662f\u5728\u670d\u52a1\u5668\u7c7b\u8ba1\u7b97\u673a\u4e0a\u8fd0\u884c\u3002\n
+java.launcher.ergo.message1 =\ \u9ED8\u8BA4 VM \u662F {0}
+java.launcher.ergo.message2 =\ \u56E0\u4E3A\u60A8\u662F\u5728\u670D\u52A1\u5668\u7C7B\u8BA1\u7B97\u673A\u4E0A\u8FD0\u884C\u3002\n
# Translators please note do not translate the options themselves
-java.launcher.opt.footer =\ -cp <\u76ee\u5f55\u548c zip/jar \u6587\u4ef6\u7684\u7c7b\u641c\u7d22\u8def\u5f84>\n\ -classpath <\u76ee\u5f55\u548c zip/jar \u6587\u4ef6\u7684\u7c7b\u641c\u7d22\u8def\u5f84>\n\ \u4e00\u4e2a\u4ee5 {0} \u5206\u9694\u7684\u76ee\u5f55\u3001JAR \u5f52\u6863\u6587\u4ef6\n\ \u548c ZIP \u5f52\u6863\u6587\u4ef6\u7684\u5217\u8868\uff0c\u7528\u4e8e\u641c\u7d22\u7c7b\u6587\u4ef6\u3002\n\ -D<name>=<value>\n\ \u8bbe\u7f6e\u7cfb\u7edf\u5c5e\u6027\n\ -verbose[:class|gc|jni]\n\ \u542f\u7528\u8be6\u7ec6\u8f93\u51fa\n\ -version \u663e\u793a\u4ea7\u54c1\u7248\u672c\u5e76\u9000\u51fa\n\ -version:<value>\n\ \u8981\u6c42\u8fd0\u884c\u6307\u5b9a\u7684\u7248\u672c\n\ -showversion \u663e\u793a\u4ea7\u54c1\u7248\u672c\u5e76\u7ee7\u7eed\n\ -jre-restrict-search | -no-jre-restrict-search\n\ \u5728\u7248\u672c\u641c\u7d22\u4e2d\u5305\u62ec/\u4e0d\u5305\u62ec\u7528\u6237\u79c1\u6709 JRE\n\ -? -help \u663e\u793a\u6b64\u5e2e\u52a9\u6d88\u606f\n\ -X \u663e\u793a\u6709\u5173\u975e\u6807\u51c6\u9009\u9879\u7684\u5e2e\u52a9\n\ -ea[:<packagename>...|:<classname>]\n\ -enableassertions[:<packagename>...|:<classname>]\n\ \u542f\u7528\u6307\u5b9a\u7c92\u5ea6\u7684\u65ad\u8a00\n\ -da[:<packagename>...|:<classname>]\n\ -disableassertions[:<packagename>...|:<classname>]\n\ \u7981\u7528\u6307\u5b9a\u7c92\u5ea6\u7684\u65ad\u8a00\n\ -esa | -enablesystemassertions\n\ \u542f\u7528\u7cfb\u7edf\u65ad\u8a00\n\ -dsa | -disablesystemassertions\n\ \u7981\u7528\u7cfb\u7edf\u65ad\u8a00\n\ -agentlib:<libname>[=<options>]\n\ \u88c5\u5165\u672c\u673a\u4ee3\u7406\u5e93 <libname>\uff0c\u4f8b\u5982\uff1a-agentlib:hprof\n\ \u53e6\u8bf7\u53c2\u89c1 -agentlib:jdwp=help \u548c -agentlib:hprof=help\n\ -agentpath:<pathname>[=<options>]\n\ \u4ee5\u5168\u8def\u5f84\u540d\u88c5\u5165\u672c\u673a\u4ee3\u7406\u5e93\n\ -javaagent:<jarpath>[=<options>]\n\ \u88c5\u5165 Java \u7f16\u7a0b\u8bed\u8a00\u4ee3\u7406\uff0c\u8bf7\u53c2\u89c1 java.lang.instrument\n\ -splash:<imagepath>\n\ \u4f7f\u7528\u6307\u5b9a\u56fe\u50cf\u663e\u793a\u95ea\u73b0\u5c4f\u5e55\n\u6709\u5173\u66f4\u591a\u8be6\u7ec6\u4fe1\u606f\uff0c\u8bf7\u53c2\u89c1 http://java.sun.com/javase/reference\u3002
+java.launcher.opt.footer =\ -cp <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n\ -classpath <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n\ \u7528 {0} \u5206\u9694\u7684\u76EE\u5F55, JAR \u6863\u6848\n\ \u548C ZIP \u6863\u6848\u5217\u8868, \u7528\u4E8E\u641C\u7D22\u7C7B\u6587\u4EF6\u3002\n\ -D<name>=<value>\n\ \u8BBE\u7F6E\u7CFB\u7EDF\u5C5E\u6027\n\ -verbose[:class|gc|jni]\n\ \u542F\u7528\u8BE6\u7EC6\u8F93\u51FA\n\ -version \u8F93\u51FA\u4EA7\u54C1\u7248\u672C\u5E76\u9000\u51FA\n\ -version:<value>\n\ \u9700\u8981\u6307\u5B9A\u7684\u7248\u672C\u624D\u80FD\u8FD0\u884C\n\ -showversion \u8F93\u51FA\u4EA7\u54C1\u7248\u672C\u5E76\u7EE7\u7EED\n\ -jre-restrict-search | -no-jre-restrict-search\n\ \u5728\u7248\u672C\u641C\u7D22\u4E2D\u5305\u62EC/\u6392\u9664\u7528\u6237\u4E13\u7528 JRE\n\ -? -help \u8F93\u51FA\u6B64\u5E2E\u52A9\u6D88\u606F\n\ -X \u8F93\u51FA\u975E\u6807\u51C6\u9009\u9879\u7684\u5E2E\u52A9\n\ -ea[:<packagename>...|:<classname>]\n\ -enableassertions[:<packagename>...|:<classname>]\n\ \u6309\u6307\u5B9A\u7684\u7C92\u5EA6\u542F\u7528\u65AD\u8A00\n\ -da[:<packagename>...|:<classname>]\n\ -disableassertions[:<packagename>...|:<classname>]\n\ \u7981\u7528\u5177\u6709\u6307\u5B9A\u7C92\u5EA6\u7684\u65AD\u8A00\n\ -esa | -enablesystemassertions\n\ \u542F\u7528\u7CFB\u7EDF\u65AD\u8A00\n\ -dsa | -disablesystemassertions\n\ \u7981\u7528\u7CFB\u7EDF\u65AD\u8A00\n\ -agentlib:<libname>[=<options>]\n\ \u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93 <libname>, \u4F8B\u5982 -agentlib:hprof\n\ \u53E6\u8BF7\u53C2\u9605 -agentlib:jdwp=help \u548C -agentlib:hprof=help\n\ -agentpath:<pathname>[=<options>]\n\ \u6309\u5B8C\u6574\u8DEF\u5F84\u540D\u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93\n\ -javaagent:<jarpath>[=<options>]\n\ \u52A0\u8F7D Java \u7F16\u7A0B\u8BED\u8A00\u4EE3\u7406, \u8BF7\u53C2\u9605 java.lang.instrument\n\ -splash:<imagepath>\n\ \u4F7F\u7528\u6307\u5B9A\u7684\u56FE\u50CF\u663E\u793A\u542F\u52A8\u5C4F\u5E55\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605 http://java.sun.com/javase/reference\u3002
# Translators please note do not translate the options themselves
-java.launcher.X.usage=\ -Xmixed \u6df7\u5408\u6a21\u5f0f\u6267\u884c\uff08\u9ed8\u8ba4\uff09\n\ -Xint \u4ec5\u89e3\u91ca\u6a21\u5f0f\u6267\u884c\n\ -Xbootclasspath:<\u4ee5 {0} \u5206\u9694\u7684\u76ee\u5f55\u548c zip/jar \u6587\u4ef6>\n\ \u8bbe\u7f6e\u5f15\u5bfc\u7c7b\u548c\u8d44\u6e90\u7684\u641c\u7d22\u8def\u5f84\n\ -Xbootclasspath/a:<\u4ee5 {0} \u5206\u9694\u7684\u76ee\u5f55\u548c zip/jar \u6587\u4ef6>\n\ \u9644\u52a0\u5230\u5f15\u5bfc\u7c7b\u8def\u5f84\u5c3e\u90e8\n\ -Xbootclasspath/p:<\u4ee5 {0} \u5206\u9694\u7684\u76ee\u5f55\u548c zip/jar \u6587\u4ef6>\n\ \u7f6e\u4e8e\u5f15\u5bfc\u7c7b\u8def\u5f84\u524d\u9762\n\ -Xnoclassgc \u7981\u7528\u7c7b\u5783\u573e\u6536\u96c6\n\ -Xincgc \u542f\u7528\u589e\u91cf\u5783\u573e\u6536\u96c6\n\ -Xloggc:<\u6587\u4ef6> \u5c06 GC \u72b6\u6001\u8bb0\u5f55\u5230\u4e00\u4e2a\u5e26\u6709\u65f6\u95f4\u6233\u7684\u6587\u4ef6\n\ -Xbatch \u7981\u7528\u540e\u53f0\u7f16\u8bd1\n\ -Xms<\u5927\u5c0f> \u8bbe\u7f6e\u521d\u59cb Java \u5806\u5927\u5c0f\n\ -Xmx<\u5927\u5c0f> \u8bbe\u7f6e\u6700\u5927 Java \u5806\u5927\u5c0f\n\ -Xss<\u5927\u5c0f> \u8bbe\u7f6e Java \u7ebf\u7a0b\u5806\u6808\u5927\u5c0f\n\ -Xprof \u8f93\u51fa CPU \u914d\u7f6e\u6570\u636e\n\ -Xfuture \u542f\u7528\u6700\u4e25\u683c\u7684\u68c0\u67e5\uff0c\u672a\u6765\u53ef\u80fd\u4f1a\u6210\u4e3a\u9ed8\u8ba4\u9009\u9879\n\ -Xrs \u51cf\u5c11 Java/VM \u5bf9\u64cd\u4f5c\u7cfb\u7edf\u4fe1\u53f7\u7684\u4f7f\u7528\uff08\u8bf7\u53c2\u89c1\u6587\u6863\uff09\n\ -Xcheck:jni \u9488\u5bf9 JNI \u529f\u80fd\u6267\u884c\u989d\u5916\u7684\u68c0\u67e5\n\ -Xshare:off \u4e0d\u5c1d\u8bd5\u4f7f\u7528\u5171\u4eab\u7c7b\u6570\u636e\n\ -Xshare:auto \u5982\u679c\u53ef\u80fd\u7684\u8bdd\uff0c\u4f7f\u7528\u5171\u4eab\u7c7b\u6570\u636e\uff08\u9ed8\u8ba4\uff09\n\ -Xshare:on \u8981\u6c42\u4f7f\u7528\u5171\u4eab\u7c7b\u6570\u636e\uff0c\u5426\u5219\u4f1a\u5931\u8d25\u3002\n\n-X \u9009\u9879\u662f\u975e\u6807\u51c6\u9009\u9879\uff0c\u5982\u6709\u66f4\u6539\uff0c\u6055\u4e0d\u53e6\u884c\u901a\u77e5\u3002\n
+java.launcher.X.usage=\ -Xmixed \u6DF7\u5408\u6A21\u5F0F\u6267\u884C (\u9ED8\u8BA4)\n\ -Xint \u4EC5\u89E3\u91CA\u6A21\u5F0F\u6267\u884C\n\ -Xbootclasspath:<\u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u548C zip/jar \u6587\u4EF6>\n\ \u8BBE\u7F6E\u641C\u7D22\u8DEF\u5F84\u4EE5\u5F15\u5BFC\u7C7B\u548C\u8D44\u6E90\n\ -Xbootclasspath/a:<\u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u548C zip/jar \u6587\u4EF6>\n\ \u9644\u52A0\u5728\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u672B\u5C3E\n\ -Xbootclasspath/p:<\u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u548C zip/jar \u6587\u4EF6>\n\ \u7F6E\u4E8E\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u4E4B\u524D\n\ -Xdiag \u663E\u793A\u9644\u52A0\u8BCA\u65AD\u6D88\u606F\n\ -Xnoclassgc \u7981\u7528\u7C7B\u5783\u573E\u6536\u96C6\n\ -Xincgc \u542F\u7528\u589E\u91CF\u5783\u573E\u6536\u96C6\n\ -Xloggc:<file> \u5C06 GC \u72B6\u6001\u8BB0\u5F55\u5728\u6587\u4EF6\u4E2D (\u5E26\u65F6\u95F4\u6233)\n\ -Xbatch \u7981\u7528\u540E\u53F0\u7F16\u8BD1\n\ -Xms<size> \u8BBE\u7F6E\u521D\u59CB Java \u5806\u5927\u5C0F\n\ -Xmx<size> \u8BBE\u7F6E\u6700\u5927 Java \u5806\u5927\u5C0F\n\ -Xss<size> \u8BBE\u7F6E Java \u7EBF\u7A0B\u5806\u6808\u5927\u5C0F\n\ -Xprof \u8F93\u51FA cpu \u914D\u7F6E\u6587\u4EF6\u6570\u636E\n\ -Xfuture \u542F\u7528\u6700\u4E25\u683C\u7684\u68C0\u67E5, \u9884\u671F\u5C06\u6765\u7684\u9ED8\u8BA4\u503C\n\ -Xrs \u51CF\u5C11 Java/VM \u5BF9\u64CD\u4F5C\u7CFB\u7EDF\u4FE1\u53F7\u7684\u4F7F\u7528 (\u8BF7\u53C2\u9605\u6587\u6863)\n\ -Xcheck:jni \u5BF9 JNI \u51FD\u6570\u6267\u884C\u5176\u4ED6\u68C0\u67E5\n\ -Xshare:off \u4E0D\u5C1D\u8BD5\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\n\ -Xshare:auto \u5728\u53EF\u80FD\u7684\u60C5\u51B5\u4E0B\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E (\u9ED8\u8BA4)\n\ -Xshare:on \u8981\u6C42\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E, \u5426\u5219\u5C06\u5931\u8D25\u3002\n\ -XshowSettings \u663E\u793A\u6240\u6709\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n\ -XshowSettings:all\n\ \u663E\u793A\u6240\u6709\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n\ -XshowSettings:vm \u663E\u793A\u6240\u6709\u4E0E vm \u76F8\u5173\u7684\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n\ -XshowSettings:properties\n\ \u663E\u793A\u6240\u6709\u5C5E\u6027\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n\ -XshowSettings:locale\n\ \u663E\u793A\u6240\u6709\u4E0E\u533A\u57DF\u8BBE\u7F6E\u76F8\u5173\u7684\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n\n-X \u9009\u9879\u662F\u975E\u6807\u51C6\u9009\u9879, \u5982\u6709\u66F4\u6539, \u6055\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
-java.launcher.cls.error1=\u9519\u8bef\uff1a\u627e\u4e0d\u5230\u4e3b\u7c7b {0}
-java.launcher.cls.error2=\u9519\u8bef\uff1aMain \u65b9\u6cd5\u4e0d\u662f\u7c7b {1} \u4e2d\u7684 {0}\uff0c\u8bf7\u5c06 main \u65b9\u6cd5\u5b9a\u4e49\u4e3a\uff1a\n\ public static void main(String[] args)
-java.launcher.cls.error3=\u9519\u8bef\uff1a\u5728\u7c7b {0} \u4e2d\uff0cMain \u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de void \u7c7b\u578b\u7684\u503c\uff0c\u8bf7\u5c06 \nmain \u65b9\u6cd5\u5b9a\u4e49\u4e3a\uff1a\n\ public static void main(String[] args)
-java.launcher.cls.error4=\u9519\u8bef\uff1a\u5728\u7c7b {0} \u4e2d\u672a\u627e\u5230 Main \u65b9\u6cd5\uff0c\u8bf7\u5c06 main \u65b9\u6cd5\u5b9a\u4e49\u4e3a\uff1a\n\ public static void main(String[] args)
-
-
+java.launcher.cls.error1=\u9519\u8BEF: \u627E\u4E0D\u5230\u6216\u65E0\u6CD5\u52A0\u8F7D\u4E3B\u7C7B {0}
+java.launcher.cls.error2=\u9519\u8BEF: \u4E3B\u65B9\u6CD5\u4E0D\u662F\u7C7B {1} \u4E2D\u7684{0}, \u8BF7\u5C06\u4E3B\u65B9\u6CD5\u5B9A\u4E49\u4E3A:\n\ public static void main(String[] args)
+java.launcher.cls.error3=\u9519\u8BEF: \u4E3B\u65B9\u6CD5\u5FC5\u987B\u8FD4\u56DE\u7C7B {0} \u4E2D\u7684\u7A7A\u7C7B\u578B\u503C, \u8BF7\n\u5C06\u4E3B\u65B9\u6CD5\u5B9A\u4E49\u4E3A:\n\ public static void main(String[] args)
+java.launcher.cls.error4=\u9519\u8BEF: \u5728\u7C7B {0} \u4E2D\u627E\u4E0D\u5230\u4E3B\u65B9\u6CD5, \u8BF7\u5C06\u4E3B\u65B9\u6CD5\u5B9A\u4E49\u4E3A:\n\ public static void main(String[] args)
+java.launcher.jar.error1=\u9519\u8BEF: \u5C1D\u8BD5\u6253\u5F00\u6587\u4EF6{0}\u65F6\u51FA\u73B0\u610F\u5916\u9519\u8BEF
+java.launcher.jar.error2=\u5728{0}\u4E2D\u627E\u4E0D\u5230\u6E05\u5355
+java.launcher.jar.error3={0}\u4E2D\u6CA1\u6709\u4E3B\u6E05\u5355\u5C5E\u6027
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_zh_TW.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_zh_TW.properties Mon Apr 11 16:19:20 2011 -0700
@@ -24,24 +24,25 @@
#
# Translators please note do not translate the options themselves
-java.launcher.opt.header = \u7528\u6cd5: {0} [-options] class [args...]\n\ (\u57f7\u884c\u985e\u5225)\n \u6216 {0} [-options] -jar jarfile [args...]\n\ (\u57f7\u884c jar \u6a94\u6848)\n\u5176\u4e2d options \u5305\u62ec:\n
+java.launcher.opt.header = \u7528\u6CD5: {0} [-options] class [args...]\n\ (\u57F7\u884C\u985E\u5225)\n \u6216 {0} [-options] -jar jarfile [args...]\n\ (\u57F7\u884C jar \u6A94\u6848)\n\u9078\u9805\u5305\u62EC:\n
-java.launcher.opt.datamodel =\ -d{0}\t \u4f7f\u7528 {0} \u4f4d\u5143\u8cc7\u6599\u6a21\u5f0f (\u5982\u679c\u53ef\u7528)\n
-java.launcher.opt.vmselect =\ {0}\t \u9078\u53d6\u300c{1}\u300dVM\n
-java.launcher.opt.hotspot =\ {0}\t \u662f\u300c{1}\u300dVM [\u5df2\u505c\u7528] \u7684\u540c\u7fa9\u8a5e\n
+java.launcher.opt.datamodel =\ -d{0}\t \u4F7F\u7528 {0} \u4F4D\u5143\u8CC7\u6599\u6A21\u578B (\u5982\u679C\u6709\u7684\u8A71)\n
+java.launcher.opt.vmselect =\ {0}\t \u9078\u53D6 "{1}" VM\n
+java.launcher.opt.hotspot =\ {0}\t \u662F "{1}" VM \u7684\u540C\u7FA9\u5B57 [\u5DF2\u4E0D\u518D\u4F7F\u7528]\n
-java.launcher.ergo.message1 =\ \u9810\u8a2d VM \u70ba {0}
-java.launcher.ergo.message2 =\ \u56e0\u70ba\u60a8\u6b63\u57f7\u884c\u65bc\u4f3a\u670d\u5668\u7d1a\u7684\u6a5f\u5668\u4e0a\u3002\n
+java.launcher.ergo.message1 =\ \u9810\u8A2D\u7684 VM \u70BA {0}
+java.launcher.ergo.message2 =\ \u56E0\u70BA\u60A8\u6B63\u5728\u4F3A\u670D\u5668\u985E\u5225\u6A5F\u5668\u4E0A\u57F7\u884C\u3002\n
# Translators please note do not translate the options themselves
-java.launcher.opt.footer =\ -cp <\u76ee\u9304\u548c zip/jar \u6a94\u6848\u7684\u985e\u5225\u641c\u5c0b\u8def\u5f91>\n\ -classpath <\u76ee\u9304\u548c zip/jar \u6a94\u6848\u7684\u985e\u5225\u641c\u5c0b\u8def\u5f91>\n\ {0} \u76ee\u9304\u3001JAR \u6b78\u6a94\n\ \u548c ZIP \u6b78\u6a94\u7684\u5206\u9694\u6e05\u55ae\uff0c\u7528\u65bc\u641c\u5c0b\u985e\u5225\u6a94\u6848\u3002\n\ -D<name>=<value>\n\ \u8a2d\u5b9a\u7cfb\u7d71\u7279\u6027\n\ -verbose[:class|gc|jni]\n\ \u555f\u7528\u8a73\u7d30\u8f38\u51fa\n\ -version \u5217\u5370\u7522\u54c1\u7248\u672c\u4e26\u7d50\u675f\n\ -version:<value>\n\ \u9700\u8981\u57f7\u884c\u6307\u5b9a\u7684\u7248\u672c\n\ -showversion \u5217\u5370\u7522\u54c1\u7248\u672c\u4e26\u7e7c\u7e8c\n\ -jre-restrict-search | -no-jre-restrict-search\n\ \u5728\u7248\u672c\u641c\u5c0b\u4e2d\u5305\u542b/\u6392\u9664\u4f7f\u7528\u8005\u79c1\u7528 JRE\n\ -? -help \u5217\u5370\u6b64\u8aaa\u660e\u8a0a\u606f\n\ -X \u5217\u5370\u6709\u95dc\u975e\u6a19\u6e96\u9078\u9805\u7684\u8aaa\u660e\n\ -ea[:<packagename>...|:<classname>]\n\ -enableassertions[:<packagename>...|:<classname>]\n\ \u555f\u7528\u5177\u6709\u6307\u5b9a\u9846\u7c92\u6027\u7684\u5ba3\u544a\n\ -da[:<packagename>...|:<classname>]\n\ -disableassertions[:<packagename>...|:<classname>]\n\ \u505c\u7528\u5177\u6709\u6307\u5b9a\u9846\u7c92\u6027\u7684\u5ba3\u544a\n\ -esa | -enablesystemassertions\n\ \u555f\u7528\u7cfb\u7d71\u5ba3\u544a\n\ -dsa | -disablesystemassertions\n\ \u505c\u7528\u7cfb\u7d71\u5ba3\u544a\n\ -agentlib:<libname>[=<options>]\n\ \u8f09\u5165\u539f\u751f\u4ee3\u7406\u7a0b\u5f0f\u7a0b\u5f0f\u5eab <libname>\uff0c\u4f8b\u5982 -agentlib:hprof\n\ \u53e6\u8acb\u53c3\u95b1 -agentlib:jdwp=help \u548c -agentlib:hprof=help\n\ -agentpath:<pathname>[=<options>]\n\ \u4f9d\u64da\u5b8c\u6574\u8def\u5f91\u540d\u7a31\u8f09\u5165\u539f\u751f\u4ee3\u7406\u7a0b\u5f0f\n\ -javaagent:<jarpath>[=<options>]\n\ \u8f09\u5165 Java \u7a0b\u5f0f\u8a2d\u8a08\u8a9e\u8a00\u4ee3\u7406\u7a0b\u5f0f\uff0c\u8acb\u53c3\u95b1 java.lang.instrument\n\ -splash:<imagepath>\n\ \u986f\u793a\u542b\u6709\u6307\u5b9a\u5f71\u50cf\u7684\u8edf\u9ad4\u8cc7\u8a0a\u756b\u9762\n\u8acb\u53c3\u95b1 http://java.sun.com/javase/reference\uff0c\u4ee5\u53d6\u5f97\u66f4\u591a\u8a73\u7d30\u8cc7\u8a0a\u3002
+java.launcher.opt.footer =\ -cp <class search path of directories and zip/jar files>\n\ -classpath <class search path of directories and zip/jar files>\n\ \u641C\u5C0B\u985E\u5225\u6A94\u6848\u4E4B\u76EE\u9304\u3001JAR \u5B58\u6A94\n\ \u548C ZIP \u5B58\u6A94\u7684\u4EE5{0}\u5206\u9694\u7684\u6E05\u55AE\u3002\n\ -D<name>=<value>\n\ \u8A2D\u5B9A\u7CFB\u7D71\u5C6C\u6027\n\ -verbose[:class|gc|jni]\n\ \u555F\u7528\u8A73\u7D30\u8CC7\u8A0A\u8F38\u51FA\n\ -version \u5217\u5370\u7522\u54C1\u7248\u672C\u4E26\u7D50\u675F\n\ -version:<value>\n\ \u9700\u8981\u6307\u5B9A\u7684\u7248\u672C\u624D\u80FD\u57F7\u884C\n\ -showversion \u5217\u5370\u7522\u54C1\u7248\u672C\u4E26\u7E7C\u7E8C\n\ -jre-restrict-search | -no-jre-restrict-search\n\ \u5728\u7248\u672C\u641C\u5C0B\u4E2D\u5305\u62EC/\u6392\u9664\u4F7F\u7528\u8005\u5C08\u7528 JRE\n\ -? -help \u5217\u5370\u6B64\u8AAA\u660E\u8A0A\u606F\n\ -X \u5217\u5370\u975E\u6A19\u6E96\u9078\u9805\u7684\u8AAA\u660E\n\ -ea[:<packagename>...|:<classname>]\n\ -enableassertions[:<packagename>...|:<classname>]\n\ \u555F\u7528\u5177\u6709\u6307\u5B9A\u8A73\u7D30\u7A0B\u5EA6\u7684\u5BA3\u544A\n\ -da[:<packagename>...|:<classname>]\n\ -disableassertions[:<packagename>...|:<classname>]\n\ \u505C\u7528\u5177\u6709\u6307\u5B9A\u8A73\u7D30\u7A0B\u5EA6\u7684\u5BA3\u544A\n\ -esa | -enablesystemassertions\n\ \u555F\u7528\u7CFB\u7D71\u5BA3\u544A\n\ -dsa | -disablesystemassertions\n\ \u505C\u7528\u7CFB\u7D71\u5BA3\u544A\n\ -agentlib:<libname>[=<options>]\n\ \u8F09\u5165\u539F\u751F\u4EE3\u7406\u7A0B\u5F0F\u7A0B\u5F0F\u5EAB <libname>\uFF0C\u4F8B\u5982 -agentlib:hprof\n\ \u53E6\u8ACB\u53C3\u95B1 -agentlib:jdwp=help \u8207 -agentlib:hprof=help\n\ -agentpath:<pathname>[=<options>]\n\ \u4F7F\u7528\u5B8C\u6574\u8DEF\u5F91\u540D\u7A31\u8F09\u5165\u539F\u751F\u4EE3\u7406\u7A0B\u5F0F\u7A0B\u5F0F\u5EAB\n\ -javaagent:<jarpath>[=<options>]\n\ \u8F09\u5165 Java \u7A0B\u5F0F\u8A9E\u8A00\u4EE3\u7406\u7A0B\u5F0F\uFF0C\u8ACB\u53C3\u95B1 java.lang.instrument\n\ -splash:<imagepath>\n\ \u986F\u793A\u6307\u5B9A\u5F71\u50CF\u7684\u8EDF\u9AD4\u8CC7\u8A0A\u756B\u9762\n\u8ACB\u53C3\u95B1 http://java.sun.com/javase/reference\uFF0C\u66B8\u89E3\u8A73\u7D30\u8CC7\u8A0A\u3002
# Translators please note do not translate the options themselves
-java.launcher.X.usage=\ -Xmixed \u57f7\u884c\u6df7\u5408\u6a21\u5f0f (\u9810\u8a2d)\n\ -Xint \u50c5\u57f7\u884c\u89e3\u8b6f\u6a21\u5f0f\n\ -Xbootclasspath:<\u4ee5 {0} \u5206\u9694\u7684\u76ee\u9304\u548c zip/jar \u6a94\u6848>\n\ \u8a2d\u5b9a\u555f\u52d5\u985e\u5225\u548c\u8cc7\u6e90\u7684\u641c\u5c0b\u8def\u5f91\n\ -Xbootclasspath/a:<\u4ee5 {0} \u5206\u9694\u7684\u76ee\u9304\u548c zip/jar \u6a94\u6848>\n\ \u9644\u52a0\u81f3\u555f\u52d5\u985e\u5225\u7684\u672b\u5c3e\n\ -Xbootclasspath/p:<\u4ee5 {0} \u5206\u9694\u7684\u76ee\u9304\u548c zip/jar \u6a94\u6848>\n\ \u524d\u7f6e\u65bc\u555f\u52d5\u985e\u5225\u8def\u5f91\u7684\u524d\u9762\n\ -Xnoclassgc \u505c\u7528\u985e\u5225\u56de\u6536\u6536\u96c6\n\ -Xincgc \u555f\u7528\u905e\u589e\u56de\u6536\u6536\u96c6\n\ -Xloggc:<\u6a94\u6848> \u4f7f\u7528\u6642\u9593\u6233\u8a18\u5c07 GC \u72c0\u614b\u8a18\u9304\u81f3\u6a94\u6848\n\ -Xbatch \u505c\u7528\u80cc\u5f71\u7de8\u8b6f\n\ -Xms<\u5927\u5c0f> \u8a2d\u5b9a\u521d\u59cb Java \u5806\u758a\u5927\u5c0f\n\ -Xmx<\u5927\u5c0f> \u8a2d\u5b9a\u6700\u5927 Java \u5806\u758a\u5927\u5c0f\n\ -Xss<\u5927\u5c0f> \u8a2d\u5b9a java \u57f7\u884c\u7dd2\u5806\u758a\u5927\u5c0f\n\ -Xprof \u8f38\u51fa cpu \u8a2d\u5b9a\u6a94\u8cc7\u6599\n\ -Xfuture \u555f\u7528\u6700\u56b4\u683c\u7684\u6aa2\u67e5\uff0c\u9810\u671f\u672a\u4f86\u9810\u8a2d\u503c\n\ -Xrs \u964d\u4f4e Java/VM \u7684 OS \u8a0a\u865f\u4f7f\u7528 (\u8acb\u53c3\u95b1\u6587\u4ef6)\n\ -Xcheck:jni \u5c0d JNI \u529f\u80fd\u57f7\u884c\u5176\u4ed6\u6aa2\u67e5\n\ -Xshare:off \u4e0d\u5617\u8a66\u4f7f\u7528\u5171\u7528\u985e\u5225\u8cc7\u6599\n\ -Xshare:auto \u5982\u53ef\u80fd\uff0c\u4f7f\u7528\u5171\u7528\u985e\u5225\u8cc7\u6599 (\u9810\u8a2d)\n\ -Xshare:on \u9700\u8981\u4f7f\u7528\u5171\u7528\u985e\u5225\u8cc7\u6599\uff0c\u5426\u5247\u6703\u5931\u6557\u3002\n\n-X \u9078\u9805\u70ba\u975e\u6a19\u6e96\u9078\u9805\uff0c\u53ef\u80fd\u6703\u8b8a\u66f4\uff0c\u6055\u4e0d\u53e6\u884c\u901a\u77e5\u3002\n
+java.launcher.X.usage=\ -Xmixed \u6DF7\u5408\u6A21\u5F0F\u57F7\u884C (\u9810\u8A2D)\n\ -Xint \u50C5\u9650\u89E3\u8B6F\u6A21\u5F0F\u57F7\u884C\n\ -Xbootclasspath:<\u4EE5 {0} \u5206\u9694\u7684\u76EE\u9304\u548C zip/jar \u6A94\u6848>\n\ \u8A2D\u5B9A\u555F\u52D5\u5B89\u88DD\u985E\u5225\u548C\u8CC7\u6E90\u7684\u641C\u5C0B\u8DEF\u5F91\n\ -Xbootclasspath/a:<\u4EE5 {0} \u5206\u9694\u7684\u76EE\u9304\u548C zip/jar \u6A94\u6848>\n\ \u9644\u52A0\u5728\u555F\u52D5\u5B89\u88DD\u985E\u5225\u8DEF\u5F91\u7684\u7D50\u5C3E\n\ -Xbootclasspath/p:<\u4EE5 {0} \u5206\u9694\u7684\u76EE\u9304\u548C zip/jar \u6A94\u6848>\n\ \u9644\u52A0\u5728\u555F\u52D5\u5B89\u88DD\u985E\u5225\u8DEF\u5F91\u7684\u524D\u9762\n\ -Xdiag \u986F\u793A\u5176\u4ED6\u7684\u8A3A\u65B7\u8A0A\u606F\n\ -Xnoclassgc \u505C\u7528\u985E\u5225\u8CC7\u6E90\u56DE\u6536\n\ -Xincgc \u555F\u7528\u6F38\u9032\u8CC7\u6E90\u56DE\u6536\n\ -Xloggc:<file> \u5229\u7528\u6642\u6233\u5C07 GC \u72C0\u614B\u8A18\u9304\u81F3\u6A94\u6848\u4E2D\n\ -Xbatch \u505C\u7528\u80CC\u666F\u7DE8\u8B6F\n\ -Xms<size> \u8A2D\u5B9A\u8D77\u59CB Java \u5806\u96C6\u5927\u5C0F\n\ -Xmx<size> \u8A2D\u5B9A Java \u5806\u96C6\u5927\u5C0F\u4E0A\u9650\n\ -Xss<size> \u8A2D\u5B9A Java \u57F7\u884C\u7DD2\u5806\u758A\u5927\u5C0F\n\ -Xprof \u8F38\u51FA CPU \u5206\u6790\u8CC7\u6599\n\ -Xfuture \u555F\u7528\u6700\u56B4\u683C\u7684\u6AA2\u67E5\uFF0C\u9810\u5148\u505A\u70BA\u5C07\u4F86\u7684\u9810\u8A2D\n\ -Xrs \u6E1B\u5C11 Java/VM \u4F7F\u7528\u4F5C\u696D\u7CFB\u7D71\u4FE1\u865F (\u8ACB\u53C3\u95B1\u6587\u4EF6)\n\ -Xcheck:jni \u57F7\u884C\u5176\u4ED6\u7684 JNI \u51FD\u6578\u6AA2\u67E5\n\ -Xshare:off \u4E0D\u5617\u8A66\u4F7F\u7528\u5171\u7528\u985E\u5225\u8CC7\u6599\n\ -Xshare:auto \u5118\u53EF\u80FD\u4F7F\u7528\u5171\u7528\u985E\u5225\u8CC7\u6599 (\u9810\u8A2D)\n\ -Xshare:on \u9700\u8981\u4F7F\u7528\u5171\u7528\u985E\u5225\u8CC7\u6599\uFF0C\u5426\u5247\u5931\u6557\u3002\n\ -XshowSettings \u986F\u793A\u6240\u6709\u8A2D\u5B9A\u503C\u4E26\u7E7C\u7E8C\n\ -XshowSettings:all\n\ \u986F\u793A\u6240\u6709\u8A2D\u5B9A\u503C\u4E26\u7E7C\u7E8C\n\ -XshowSettings:vm \u986F\u793A\u6240\u6709 VM \u76F8\u95DC\u8A2D\u5B9A\u503C\u4E26\u7E7C\u7E8C\n\ -XshowSettings:properties\n\ \u986F\u793A\u6240\u6709\u5C6C\u6027\u8A2D\u5B9A\u503C\u4E26\u7E7C\u7E8C\n\ -XshowSettings:locale\n\ \u986F\u793A\u6240\u6709\u5730\u5340\u8A2D\u5B9A\u76F8\u95DC\u8A2D\u5B9A\u503C\u4E26\u7E7C\u7E8C\n\n -X \u9078\u9805\u4E0D\u662F\u6A19\u6E96\u9078\u9805\uFF0C\u82E5\u6709\u8B8A\u66F4\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
-java.launcher.cls.error1=\u932f\u8aa4\uff1a\u627e\u4e0d\u5230\u4e3b\u985e\u5225 {0}
-java.launcher.cls.error2=\u932f\u8aa4\uff1a\u5728\u985e\u5225 {1} \u4e2d\uff0c\u4e3b\u65b9\u6cd5\u4e0d\u662f {0}\uff0c\u8acb\u5b9a\u7fa9\u4e3b\u65b9\u6cd5\u70ba:\n\ public static void main(String[] args)
-java.launcher.cls.error3=\u932f\u8aa4\uff1a\u5728\u985e\u5225 {0} \u4e2d\uff0c\u4e3b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de\u985e\u578b void \u7684\u503c\uff0c\u8acb\n\u5b9a\u7fa9\u4e3b\u65b9\u6cd5\u70ba:\n\ public static void main(String[] args)
-java.launcher.cls.error4=\u932f\u8aa4\uff1a\u5728\u985e\u5225 {0} \u4e2d\u627e\u4e0d\u5230\u4e3b\u65b9\u6cd5\uff0c\u8acb\u5b9a\u7fa9\u4e3b\u65b9\u6cd5\u70ba:\n\ public static void main(String[] args)
-
-
+java.launcher.cls.error1=\u932F\u8AA4: \u627E\u4E0D\u5230\u6216\u7121\u6CD5\u8F09\u5165\u4E3B\u8981\u985E\u5225 {0}
+java.launcher.cls.error2=\u932F\u8AA4: \u4E3B\u8981\u65B9\u6CD5\u4E0D\u662F\u985E\u5225 {1} \u4E2D\u7684 {0}\uFF0C\u8ACB\u5B9A\u7FA9\u4E3B\u8981\u65B9\u6CD5\u70BA:\n\ public static void main(String[] args)
+java.launcher.cls.error3=\u932F\u8AA4: \u4E3B\u8981\u65B9\u6CD5\u5FC5\u9808\u50B3\u56DE\u985E\u5225 {0} \u4E2D void \u985E\u578B\u7684\u503C\uFF0C \n\u8ACB\u5B9A\u7FA9\u4E3B\u8981\u65B9\u6CD5\u70BA:\n\ public static void main(String[] args)
+java.launcher.cls.error4=\u932F\u8AA4: \u5728\u985E\u5225 {0} \u4E2D\u627E\u4E0D\u5230\u4E3B\u8981\u65B9\u6CD5\uFF0C\u8ACB\u5B9A\u7FA9\u4E3B\u8981\u65B9\u6CD5\u70BA:\n\ public static void main(String[] args)
+java.launcher.jar.error1=\u932F\u8AA4: \u5617\u8A66\u958B\u555F\u6A94\u6848 {0} \u6642\u767C\u751F\u672A\u9810\u671F\u7684\u932F\u8AA4
+java.launcher.jar.error2=\u5728 {0} \u4E2D\u627E\u4E0D\u5230\u8CC7\u8A0A\u6E05\u55AE
+java.launcher.jar.error3={0} \u4E2D\u6C92\u6709\u4E3B\u8981\u8CC7\u8A0A\u6E05\u55AE\u5C6C\u6027
--- a/jdk/src/share/classes/sun/print/resources/serviceui_de.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_de.properties Mon Apr 11 16:19:20 2011 -0700
@@ -15,13 +15,13 @@
button.ok=OK
button.print=Drucken
button.properties=Eigenschaften...
-button.properties.mnemonic=E
+button.properties.mnemonic=I
#
checkbox.collate=Sortieren
checkbox.collate.mnemonic=S
checkbox.jobsheets=Bannerseite
checkbox.jobsheets.mnemonic=B
-checkbox.printtofile=In Datei drucken
+checkbox.printtofile=Ausgabe in Datei
checkbox.printtofile.mnemonic=D
#
dialog.printtitle=Drucken
@@ -33,7 +33,7 @@
dialog.writeerror=Schreiben in Datei nicht m\u00F6glich:
#
label.info=Info:
-label.jobname=Jobname:
+label.jobname=Job-Name:
label.jobname.mnemonic=J
label.numcopies=Anzahl Kopien:
label.numcopies.mnemonic=K
@@ -44,65 +44,65 @@
label.pstype=Typ:
label.rangeto=Bis
label.size=Gr\u00F6\u00DFe:
-label.size.mnemonic=G
+label.size.mnemonic=R
label.source=Quelle:
-label.source.mnemonic=U
+label.source.mnemonic=Q
label.status=Status:
label.username=Benutzername:
-label.username.mnemonic=Z
+label.username.mnemonic=B
label.millimetres=(mm)
label.inches=(Zoll)
label.topmargin=oben
label.topmargin.mnemonic=O
label.bottommargin=unten
-label.bottommargin.mnemonic=T
+label.bottommargin.mnemonic=U
label.leftmargin=links
label.leftmargin.mnemonic=L
label.rightmargin=rechts
-label.rightmargin.mnemonic=C
+label.rightmargin.mnemonic=R
#
radiobutton.color=Farbe
radiobutton.color.mnemonic=F
radiobutton.draftq=Entwurf
radiobutton.draftq.mnemonic=W
radiobutton.duplex=Duplex
-radiobutton.duplex.mnemonic=X
+radiobutton.duplex.mnemonic=D
radiobutton.highq=Hoch
radiobutton.highq.mnemonic=H
radiobutton.landscape=Querformat
radiobutton.landscape.mnemonic=Q
-radiobutton.monochrome=Schwarzwei\u00DF
-radiobutton.monochrome.mnemonic=W
+radiobutton.monochrome=Monochrom
+radiobutton.monochrome.mnemonic=M
radiobutton.normalq=Normal
-radiobutton.normalq.mnemonic=M
+radiobutton.normalq.mnemonic=N
radiobutton.oneside=Einseitig
radiobutton.oneside.mnemonic=E
radiobutton.portrait=Hochformat
-radiobutton.portrait.mnemonic=H
+radiobutton.portrait.mnemonic=M
radiobutton.rangeall=Alle
radiobutton.rangeall.mnemonic=L
radiobutton.rangepages=Seiten
-radiobutton.rangepages.mnemonic=T
+radiobutton.rangepages.mnemonic=E
radiobutton.revlandscape=Umgekehrtes Querformat
-radiobutton.revlandscape.mnemonic=M
+radiobutton.revlandscape.mnemonic=U
radiobutton.revportrait=Umgekehrtes Hochformat
-radiobutton.revportrait.mnemonic=K
+radiobutton.revportrait.mnemonic=H
radiobutton.tumble=Kalenderdruck
radiobutton.tumble.mnemonic=K
# The vkMnemonics correspond with the constants defined in KeyEvent, eg
# 65 = KeyEvent.VK_A
tab.appearance=Darstellung
-tab.appearance.vkMnemonic=65
+tab.appearance.vkMnemonic=68
tab.general=Allgemein
-tab.general.vkMnemonic=71
+tab.general.vkMnemonic=65
tab.pagesetup=Seite einrichten
-tab.pagesetup.vkMnemonic=83
+tab.pagesetup.vkMnemonic=69
#
error.pagerange=Ung\u00FCltiger Seitenbereich. Geben Sie die Werte erneut ein (Beispiel: 1-3,5,7-10)
error.destination=Ung\u00FCltiger Dateiname. Wiederholen Sie den Vorgang
#
# The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound
# character is replaced with 'n')
#
iso-4a0=4A0 (ISO/DIN & JIS)
@@ -207,8 +207,9 @@
Cassette=Kassette
Form-Source=Formularquelle
#
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by
# PrinterIsAcceptingJobs.toString()
#
accepting-jobs=Jobs annehmen
not-accepting-jobs=Jobs nicht annehmen
+
--- a/jdk/src/share/classes/sun/print/resources/serviceui_es.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_es.properties Mon Apr 11 16:19:20 2011 -0700
@@ -15,12 +15,12 @@
button.ok=Aceptar
button.print=Imprimir
button.properties=Propiedades...
-button.properties.mnemonic=P
+button.properties.mnemonic=R
#
checkbox.collate=Intercalar
-checkbox.collate.mnemonic=E
+checkbox.collate.mnemonic=C
checkbox.jobsheets=P\u00E1gina de R\u00F3tulo
-checkbox.jobsheets.mnemonic=R
+checkbox.jobsheets.mnemonic=L
checkbox.printtofile=Imprimir en Archivo
checkbox.printtofile.mnemonic=M
#
@@ -34,61 +34,61 @@
#
label.info=Informaci\u00F3n:
label.jobname=Nombre del Trabajo:
-label.jobname.mnemonic=T
+label.jobname.mnemonic=N
label.numcopies=N\u00FAmero de Copias:
label.numcopies.mnemonic=O
label.priority=Prioridad:
-label.priority.mnemonic=R
+label.priority.mnemonic=I
label.psname=Nombre:
label.psname.mnemonic=N
label.pstype=Tipo:
label.rangeto=A
label.size=Tama\u00F1o:
-label.size.mnemonic=T
+label.size.mnemonic=\
label.source=Origen:
-label.source.mnemonic=O
+label.source.mnemonic=G
label.status=Estado:
-label.username=Nombre de Usuario:
-label.username.mnemonic=S
+label.username=Usuario:
+label.username.mnemonic=U
label.millimetres=(mm)
label.inches=(pulg.)
label.topmargin=superior
label.topmargin.mnemonic=S
label.bottommargin=inferior
-label.bottommargin.mnemonic=I
+label.bottommargin.mnemonic=F
label.leftmargin=izquierdo
-label.leftmargin.mnemonic=Z
+label.leftmargin.mnemonic=Q
label.rightmargin=derecho
-label.rightmargin.mnemonic=D
+label.rightmargin.mnemonic=E
#
radiobutton.color=Color
-radiobutton.color.mnemonic=O
+radiobutton.color.mnemonic=C
radiobutton.draftq=Borrador
-radiobutton.draftq.mnemonic=B
+radiobutton.draftq.mnemonic=R
radiobutton.duplex=D\u00FAplex
radiobutton.duplex.mnemonic=D
radiobutton.highq=Alta
-radiobutton.highq.mnemonic=L
+radiobutton.highq.mnemonic=A
radiobutton.landscape=Horizontal
-radiobutton.landscape.mnemonic=H
+radiobutton.landscape.mnemonic=Z
radiobutton.monochrome=Monocromo
radiobutton.monochrome.mnemonic=M
radiobutton.normalq=Normal
radiobutton.normalq.mnemonic=N
radiobutton.oneside=Una Cara
-radiobutton.oneside.mnemonic=U
+radiobutton.oneside.mnemonic=R
radiobutton.portrait=Vertical
radiobutton.portrait.mnemonic=V
radiobutton.rangeall=Todo
radiobutton.rangeall.mnemonic=T
radiobutton.rangepages=P\u00E1ginas
-radiobutton.rangepages.mnemonic=A
+radiobutton.rangepages.mnemonic=G
radiobutton.revlandscape=Horizontal Inverso
-radiobutton.revlandscape.mnemonic=N
+radiobutton.revlandscape.mnemonic=H
radiobutton.revportrait=Vertical Inverso
-radiobutton.revportrait.mnemonic=R
+radiobutton.revportrait.mnemonic=S
radiobutton.tumble=Cambio de Cara
-radiobutton.tumble.mnemonic=C
+radiobutton.tumble.mnemonic=B
# The vkMnemonics correspond with the constants defined in KeyEvent, eg
# 65 = KeyEvent.VK_A
tab.appearance=Apariencia
@@ -96,13 +96,13 @@
tab.general=General
tab.general.vkMnemonic=71
tab.pagesetup=Preparar P\u00E1gina
-tab.pagesetup.vkMnemonic=83
+tab.pagesetup.vkMnemonic=80
#
error.pagerange=Rango de p\u00E1ginas no v\u00E1lido; vuelva a introducir los valores (por ejemplo, 1-3, 5, 7-10)
error.destination=Nombre de archivo no v\u00E1lido; int\u00E9ntelo de nuevo
#
# The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound
# character is replaced with 'n')
#
iso-4a0=4A0 (ISO/DIN & JIS)
@@ -207,8 +207,9 @@
Cassette=Casete
Form-Source=Origen de Formulario
#
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by
# PrinterIsAcceptingJobs.toString()
#
accepting-jobs=Aceptando trabajos
not-accepting-jobs=No aceptando trabajos
+
--- a/jdk/src/share/classes/sun/print/resources/serviceui_fr.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_fr.properties Mon Apr 11 16:19:20 2011 -0700
@@ -33,8 +33,8 @@
dialog.writeerror=Impossible d'\u00E9crire dans le fichier :
#
label.info=Infos :
-label.jobname=Nom de la t\u00E2che :
-label.jobname.mnemonic=C
+label.jobname=Nom du travail :
+label.jobname.mnemonic=T
label.numcopies=Nombre de copies :
label.numcopies.mnemonic=O
label.priority=Priorit\u00E9 :
@@ -44,7 +44,7 @@
label.pstype=Type :
label.rangeto=A
label.size=Taille :
-label.size.mnemonic=A
+label.size.mnemonic=L
label.source=Source :
label.source.mnemonic=C
label.status=Statut :
@@ -53,24 +53,24 @@
label.millimetres=(mm)
label.inches=(po)
label.topmargin=haut
-label.topmargin.mnemonic=T
+label.topmargin.mnemonic=H
label.bottommargin=bas
label.bottommargin.mnemonic=B
label.leftmargin=gauche
-label.leftmargin.mnemonic=E
+label.leftmargin.mnemonic=G
label.rightmargin=droite
-label.rightmargin.mnemonic=R
+label.rightmargin.mnemonic=D
#
radiobutton.color=Couleur
-radiobutton.color.mnemonic=C
+radiobutton.color.mnemonic=U
radiobutton.draftq=Brouillon
-radiobutton.draftq.mnemonic=B
+radiobutton.draftq.mnemonic=L
radiobutton.duplex=Duplex
radiobutton.duplex.mnemonic=D
-radiobutton.highq=Haut
-radiobutton.highq.mnemonic=H
+radiobutton.highq=Max.
+radiobutton.highq.mnemonic=X
radiobutton.landscape=Paysage
-radiobutton.landscape.mnemonic=P
+radiobutton.landscape.mnemonic=S
radiobutton.monochrome=Monochrome
radiobutton.monochrome.mnemonic=M
radiobutton.normalq=Normal
@@ -78,7 +78,7 @@
radiobutton.oneside=Un c\u00F4t\u00E9
radiobutton.oneside.mnemonic=U
radiobutton.portrait=Portrait
-radiobutton.portrait.mnemonic=O
+radiobutton.portrait.mnemonic=P
radiobutton.rangeall=Tout
radiobutton.rangeall.mnemonic=T
radiobutton.rangepages=Pages
@@ -102,7 +102,7 @@
error.destination=Nom de fichier non valide ; recommencez
#
# The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound
# character is replaced with 'n')
#
iso-4a0=4A0 (ISO/DIN & JIS)
@@ -207,8 +207,9 @@
Cassette=Cassette
Form-Source=Source du formulaire
#
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by
# PrinterIsAcceptingJobs.toString()
#
accepting-jobs=Acceptation des t\u00E2ches
not-accepting-jobs=Refus des t\u00E2ches
+
--- a/jdk/src/share/classes/sun/print/resources/serviceui_it.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_it.properties Mon Apr 11 16:19:20 2011 -0700
@@ -2,7 +2,7 @@
#
border.chromaticity=Aspetto colore
border.copies=Copie
-border.jobattributes=Attributi processo
+border.jobattributes=Attributi job
border.media=Supporti
border.orientation=Orientamento
border.printrange=Intervallo di stampa
@@ -20,7 +20,7 @@
checkbox.collate=Fascicola
checkbox.collate.mnemonic=L
checkbox.jobsheets=Pagina banner
-checkbox.jobsheets.mnemonic=P
+checkbox.jobsheets.mnemonic=B
checkbox.printtofile=Stampa su file
checkbox.printtofile.mnemonic=F
#
@@ -33,18 +33,18 @@
dialog.writeerror=Impossibile scrivere nel file:
#
label.info=Informazioni:
-label.jobname=Nome processo:
-label.jobname.mnemonic=M
+label.jobname=Nome job:
+label.jobname.mnemonic=J
label.numcopies=Numero di copie:
-label.numcopies.mnemonic=U
+label.numcopies.mnemonic=O
label.priority=Priorit\u00E0:
-label.priority.mnemonic=I
+label.priority.mnemonic=R
label.psname=Nome:
label.psname.mnemonic=N
label.pstype=Tipo:
label.rangeto=A
label.size=Dimensioni:
-label.size.mnemonic=D
+label.size.mnemonic=M
label.source=Origine:
label.source.mnemonic=R
label.status=Stato:
@@ -52,14 +52,14 @@
label.username.mnemonic=U
label.millimetres=(mm)
label.inches=(poll.)
-label.topmargin=alto
-label.topmargin.mnemonic=L
-label.bottommargin=basso
-label.bottommargin.mnemonic=B
-label.leftmargin=sinistra
+label.topmargin=superiore
+label.topmargin.mnemonic=P
+label.bottommargin=inferiore
+label.bottommargin.mnemonic=F
+label.leftmargin=sinistro
label.leftmargin.mnemonic=T
-label.rightmargin=destra
-label.rightmargin.mnemonic=E
+label.rightmargin=destro
+label.rightmargin.mnemonic=D
#
radiobutton.color=Colore
radiobutton.color.mnemonic=C
@@ -67,11 +67,11 @@
radiobutton.draftq.mnemonic=B
radiobutton.duplex=Fronte retro
radiobutton.duplex.mnemonic=R
-radiobutton.highq=Alto
+radiobutton.highq=Alta
radiobutton.highq.mnemonic=L
radiobutton.landscape=Orizzontale
-radiobutton.landscape.mnemonic=O
-radiobutton.monochrome=Monocromatica
+radiobutton.landscape.mnemonic=L
+radiobutton.monochrome=Monocromatico
radiobutton.monochrome.mnemonic=A
radiobutton.normalq=Normale
radiobutton.normalq.mnemonic=N
@@ -80,14 +80,14 @@
radiobutton.portrait=Verticale
radiobutton.portrait.mnemonic=V
radiobutton.rangeall=Tutto
-radiobutton.rangeall.mnemonic=T
+radiobutton.rangeall.mnemonic=U
radiobutton.rangepages=Pagine
radiobutton.rangepages.mnemonic=E
radiobutton.revlandscape=Orizzontale capovolto
radiobutton.revlandscape.mnemonic=N
radiobutton.revportrait=Verticale capovolto
radiobutton.revportrait.mnemonic=I
-radiobutton.tumble=Testa a piede
+radiobutton.tumble=Lato corto
radiobutton.tumble.mnemonic=T
# The vkMnemonics correspond with the constants defined in KeyEvent, eg
# 65 = KeyEvent.VK_A
@@ -102,7 +102,7 @@
error.destination=Nome file non valido; riprovare
#
# The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound
# character is replaced with 'n')
#
iso-4a0=4A0 (ISO/DIN & JIS)
@@ -207,8 +207,9 @@
Cassette=Cassetta
Form-Source=Origine modulo
#
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by
# PrinterIsAcceptingJobs.toString()
#
-accepting-jobs=Accettazione processo
-not-accepting-jobs=Rifiuto processo
+accepting-jobs=Accettazione job
+not-accepting-jobs=Rifiuto job
+
--- a/jdk/src/share/classes/sun/print/resources/serviceui_ja.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_ja.properties Mon Apr 11 16:19:20 2011 -0700
@@ -14,14 +14,14 @@
button.cancel=\u53D6\u6D88
button.ok=OK
button.print=\u5370\u5237
-button.properties=\u30D7\u30ED\u30D1\u30C6\u30A3...
+button.properties=\u30D7\u30ED\u30D1\u30C6\u30A3(R)...
button.properties.mnemonic=R
#
-checkbox.collate=\u4E01\u5408\u3044
+checkbox.collate=\u4E01\u5408\u3044(C)
checkbox.collate.mnemonic=C
-checkbox.jobsheets=\u30D0\u30CA\u30FC\u30FB\u30DA\u30FC\u30B8
+checkbox.jobsheets=\u30D0\u30CA\u30FC\u30FB\u30DA\u30FC\u30B8(B)
checkbox.jobsheets.mnemonic=B
-checkbox.printtofile=\u30D5\u30A1\u30A4\u30EB\u306B\u51FA\u529B
+checkbox.printtofile=\u30D5\u30A1\u30A4\u30EB\u306B\u51FA\u529B(F)
checkbox.printtofile.mnemonic=F
#
dialog.printtitle=\u5370\u5237
@@ -33,76 +33,76 @@
dialog.writeerror=\u30D5\u30A1\u30A4\u30EB\u306B\u66F8\u304D\u8FBC\u3081\u307E\u305B\u3093:
#
label.info=\u60C5\u5831:
-label.jobname=\u30B8\u30E7\u30D6\u540D:
+label.jobname=\u30B8\u30E7\u30D6\u540D(J):
label.jobname.mnemonic=J
-label.numcopies=\u5370\u5237\u90E8\u6570:
+label.numcopies=\u5370\u5237\u90E8\u6570(O):
label.numcopies.mnemonic=O
-label.priority=\u512A\u5148\u5EA6:
+label.priority=\u512A\u5148\u5EA6(R):
label.priority.mnemonic=R
-label.psname=\u540D\u524D:
+label.psname=\u540D\u524D(N):
label.psname.mnemonic=N
label.pstype=\u30BF\u30A4\u30D7:
label.rangeto=\u5370\u5237\u7BC4\u56F2
-label.size=\u30B5\u30A4\u30BA:
+label.size=\u30B5\u30A4\u30BA(Z):
label.size.mnemonic=Z
-label.source=\u30BD\u30FC\u30B9:
+label.source=\u30BD\u30FC\u30B9(C):
label.source.mnemonic=C
label.status=\u72B6\u614B:
-label.username=\u30E6\u30FC\u30B6\u30FC\u540D:
+label.username=\u30E6\u30FC\u30B6\u30FC\u540D(U):
label.username.mnemonic=U
label.millimetres=(mm)
label.inches=(in)
-label.topmargin=\u4E0A
+label.topmargin=\u4E0A(T)
label.topmargin.mnemonic=T
-label.bottommargin=\u4E0B
+label.bottommargin=\u4E0B(B)
label.bottommargin.mnemonic=B
-label.leftmargin=\u5DE6
+label.leftmargin=\u5DE6(F)
label.leftmargin.mnemonic=F
-label.rightmargin=\u53F3
+label.rightmargin=\u53F3(R)
label.rightmargin.mnemonic=R
#
-radiobutton.color=\u30AB\u30E9\u30FC
+radiobutton.color=\u30AB\u30E9\u30FC(C)
radiobutton.color.mnemonic=C
-radiobutton.draftq=\u30C9\u30E9\u30D5\u30C8
+radiobutton.draftq=\u30C9\u30E9\u30D5\u30C8(F)
radiobutton.draftq.mnemonic=F
-radiobutton.duplex=\u4E21\u9762
+radiobutton.duplex=\u4E21\u9762(D)
radiobutton.duplex.mnemonic=D
-radiobutton.highq=\u9AD8\u54C1\u8CEA
+radiobutton.highq=\u9AD8(H)
radiobutton.highq.mnemonic=H
-radiobutton.landscape=\u30E9\u30F3\u30C9\u30B9\u30B1\u30FC\u30D7(\u6A2A)
+radiobutton.landscape=\u6A2A(L)
radiobutton.landscape.mnemonic=L
-radiobutton.monochrome=\u30E2\u30CE\u30AF\u30ED
+radiobutton.monochrome=\u30E2\u30CE\u30AF\u30ED(M)
radiobutton.monochrome.mnemonic=M
-radiobutton.normalq=\u6A19\u6E96
+radiobutton.normalq=\u6A19\u6E96(N)
radiobutton.normalq.mnemonic=N
-radiobutton.oneside=\u7247\u9762
+radiobutton.oneside=\u7247\u9762(O)
radiobutton.oneside.mnemonic=O
-radiobutton.portrait=\u30DD\u30FC\u30C8\u30EC\u30A4\u30C8(\u7E26)
+radiobutton.portrait=\u7E26(P)
radiobutton.portrait.mnemonic=P
-radiobutton.rangeall=\u3059\u3079\u3066
+radiobutton.rangeall=\u3059\u3079\u3066(L)
radiobutton.rangeall.mnemonic=L
-radiobutton.rangepages=\u30DA\u30FC\u30B8
+radiobutton.rangepages=\u30DA\u30FC\u30B8(E)
radiobutton.rangepages.mnemonic=E
-radiobutton.revlandscape=\u30E9\u30F3\u30C9\u30B9\u30B1\u30FC\u30D7(\u53CD\u8EE2)
+radiobutton.revlandscape=\u30E9\u30F3\u30C9\u30B9\u30B1\u30FC\u30D7(\u53CD\u8EE2)(N)
radiobutton.revlandscape.mnemonic=N
-radiobutton.revportrait=\u30DD\u30FC\u30C8\u30EC\u30A4\u30C8(\u53CD\u8EE2)
+radiobutton.revportrait=\u30DD\u30FC\u30C8\u30EC\u30A4\u30C8(\u53CD\u8EE2)(I)
radiobutton.revportrait.mnemonic=I
-radiobutton.tumble=\u53CD\u8EE2
+radiobutton.tumble=\u53CD\u8EE2(T)
radiobutton.tumble.mnemonic=T
# The vkMnemonics correspond with the constants defined in KeyEvent, eg
# 65 = KeyEvent.VK_A
-tab.appearance=\u5916\u89B3
+tab.appearance=\u5916\u89B3(A)
tab.appearance.vkMnemonic=65
-tab.general=\u4E00\u822C
+tab.general=\u4E00\u822C(G)
tab.general.vkMnemonic=71
-tab.pagesetup=\u30DA\u30FC\u30B8\u8A2D\u5B9A
+tab.pagesetup=\u30DA\u30FC\u30B8\u8A2D\u5B9A(S)
tab.pagesetup.vkMnemonic=83
#
error.pagerange=\u7121\u52B9\u306A\u30DA\u30FC\u30B8\u7BC4\u56F2\u3002\u5024\u3092\u518D\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044(\u4F8B\u30011-3,5,7-10)
error.destination=\u7121\u52B9\u306A\u30D5\u30A1\u30A4\u30EB\u540D\u3002\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u518D\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
#
# The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound
# character is replaced with 'n')
#
iso-4a0=4A0 (ISO/DIN & JIS)
@@ -207,8 +207,9 @@
Cassette=\u30AB\u30BB\u30C3\u30C8
Form-Source=\u30D5\u30A9\u30FC\u30E0\u30FB\u30BD\u30FC\u30B9
#
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by
# PrinterIsAcceptingJobs.toString()
#
accepting-jobs=\u30B8\u30E7\u30D6\u3092\u53D7\u3051\u4ED8\u3051\u3066\u3044\u307E\u3059
not-accepting-jobs=\u30B8\u30E7\u30D6\u3092\u53D7\u3051\u4ED8\u3051\u307E\u305B\u3093
+
--- a/jdk/src/share/classes/sun/print/resources/serviceui_ko.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_ko.properties Mon Apr 11 16:19:20 2011 -0700
@@ -14,14 +14,14 @@
button.cancel=\uCDE8\uC18C
button.ok=\uD655\uC778
button.print=\uC778\uC1C4
-button.properties=\uC18D\uC131...
+button.properties=\uC18D\uC131(R)...
button.properties.mnemonic=R
#
-checkbox.collate=\uC21C\uC11C\uB300\uB85C
+checkbox.collate=\uD55C \uBD80\uC529 \uC778\uC1C4(C)
checkbox.collate.mnemonic=C
-checkbox.jobsheets=\uBC30\uB108 \uD398\uC774\uC9C0
+checkbox.jobsheets=\uBC30\uB108 \uD398\uC774\uC9C0(B)
checkbox.jobsheets.mnemonic=B
-checkbox.printtofile=\uD30C\uC77C\uB85C \uC778\uC1C4
+checkbox.printtofile=\uD30C\uC77C\uB85C \uC778\uC1C4(F)
checkbox.printtofile.mnemonic=F
#
dialog.printtitle=\uC778\uC1C4
@@ -33,76 +33,76 @@
dialog.writeerror=\uD30C\uC77C\uC5D0 \uC4F8 \uC218 \uC5C6\uC74C:
#
label.info=\uC815\uBCF4:
-label.jobname=\uC791\uC5C5 \uC774\uB984:
+label.jobname=\uC791\uC5C5 \uC774\uB984(J):
label.jobname.mnemonic=J
-label.numcopies=\uB9E4\uC218:
+label.numcopies=\uB9E4\uC218(O):
label.numcopies.mnemonic=O
-label.priority=\uC6B0\uC120\uC21C\uC704:
+label.priority=\uC6B0\uC120\uC21C\uC704(R):
label.priority.mnemonic=R
-label.psname=\uC774\uB984:
+label.psname=\uC774\uB984(N):
label.psname.mnemonic=N
label.pstype=\uC720\uD615:
label.rangeto=\uC885\uB8CC
-label.size=\uD06C\uAE30:
+label.size=\uD06C\uAE30(Z):
label.size.mnemonic=Z
-label.source=\uC18C\uC2A4:
+label.source=\uC18C\uC2A4(C):
label.source.mnemonic=C
label.status=\uC0C1\uD0DC:
-label.username=\uC0AC\uC6A9\uC790 \uC774\uB984:
+label.username=\uC0AC\uC6A9\uC790 \uC774\uB984(U):
label.username.mnemonic=U
label.millimetres=(mm)
label.inches=(\uC778\uCE58)
-label.topmargin=\uC704\uCABD
+label.topmargin=\uC704\uCABD(T)
label.topmargin.mnemonic=T
-label.bottommargin=\uC544\uB798\uCABD
+label.bottommargin=\uC544\uB798\uCABD(B)
label.bottommargin.mnemonic=B
-label.leftmargin=\uC67C\uCABD
+label.leftmargin=\uC67C\uCABD(F)
label.leftmargin.mnemonic=F
-label.rightmargin=\uC624\uB978\uCABD
+label.rightmargin=\uC624\uB978\uCABD(R)
label.rightmargin.mnemonic=R
#
-radiobutton.color=\uC0C9\uC0C1
+radiobutton.color=\uC0C9\uC0C1(C)
radiobutton.color.mnemonic=C
-radiobutton.draftq=\uCD08\uC548
+radiobutton.draftq=\uCD08\uC548(F)
radiobutton.draftq.mnemonic=F
-radiobutton.duplex=\uC591\uBA74
+radiobutton.duplex=\uC591\uBA74(D)
radiobutton.duplex.mnemonic=D
-radiobutton.highq=\uB192\uC74C
+radiobutton.highq=\uB192\uC74C(H)
radiobutton.highq.mnemonic=H
-radiobutton.landscape=\uAC00\uB85C
+radiobutton.landscape=\uAC00\uB85C(L)
radiobutton.landscape.mnemonic=L
-radiobutton.monochrome=\uB2E8\uC0C9
+radiobutton.monochrome=\uB2E8\uC0C9(M)
radiobutton.monochrome.mnemonic=M
-radiobutton.normalq=\uC77C\uBC18
+radiobutton.normalq=\uBCF4\uD1B5(N)
radiobutton.normalq.mnemonic=N
-radiobutton.oneside=\uB2E8\uBA74
+radiobutton.oneside=\uB2E8\uBA74(O)
radiobutton.oneside.mnemonic=O
-radiobutton.portrait=\uC138\uB85C
+radiobutton.portrait=\uC138\uB85C(P)
radiobutton.portrait.mnemonic=P
-radiobutton.rangeall=\uBAA8\uB450
+radiobutton.rangeall=\uC804\uCCB4(L)
radiobutton.rangeall.mnemonic=L
-radiobutton.rangepages=\uD398\uC774\uC9C0
+radiobutton.rangepages=\uD398\uC774\uC9C0(E)
radiobutton.rangepages.mnemonic=E
-radiobutton.revlandscape=\uAC00\uB85C \uBC18\uC804
+radiobutton.revlandscape=\uAC00\uB85C \uBC18\uC804(N)
radiobutton.revlandscape.mnemonic=N
-radiobutton.revportrait=\uC138\uB85C \uBC18\uC804
+radiobutton.revportrait=\uC138\uB85C \uBC18\uC804(I)
radiobutton.revportrait.mnemonic=I
-radiobutton.tumble=\uD68C\uC804\uC2DD
+radiobutton.tumble=\uD68C\uC804\uC2DD(T)
radiobutton.tumble.mnemonic=T
# The vkMnemonics correspond with the constants defined in KeyEvent, eg
# 65 = KeyEvent.VK_A
-tab.appearance=\uBAA8\uC591
+tab.appearance=\uBAA8\uC591(A)
tab.appearance.vkMnemonic=65
-tab.general=\uC77C\uBC18 \uC0AC\uD56D
+tab.general=\uC77C\uBC18 \uC0AC\uD56D(G)
tab.general.vkMnemonic=71
-tab.pagesetup=\uD398\uC774\uC9C0 \uC124\uC815
+tab.pagesetup=\uD398\uC774\uC9C0 \uC124\uC815(S)
tab.pagesetup.vkMnemonic=83
#
error.pagerange=\uBD80\uC801\uD569\uD55C \uD398\uC774\uC9C0 \uBC94\uC704: \uAC12\uC744 \uB2E4\uC2DC \uC785\uB825\uD558\uC2ED\uC2DC\uC624(\uC608: 1-3,5,7-10).
error.destination=\uBD80\uC801\uD569\uD55C \uD30C\uC77C \uC774\uB984: \uB2E4\uC2DC \uC2DC\uB3C4\uD558\uC2ED\uC2DC\uC624.
#
# The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound
# character is replaced with 'n')
#
iso-4a0=4A0 (ISO/DIN & JIS)
@@ -207,8 +207,9 @@
Cassette=\uCE74\uC138\uD2B8
Form-Source=\uC591\uC2DD \uC18C\uC2A4
#
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by
# PrinterIsAcceptingJobs.toString()
#
accepting-jobs=\uC791\uC5C5 \uC2B9\uC778
not-accepting-jobs=\uC791\uC5C5 \uC2B9\uC778 \uC548\uD568
+
--- a/jdk/src/share/classes/sun/print/resources/serviceui_pt_BR.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_pt_BR.properties Mon Apr 11 16:19:20 2011 -0700
@@ -18,11 +18,11 @@
button.properties.mnemonic=R
#
checkbox.collate=Agrupar
-checkbox.collate.mnemonic=C
+checkbox.collate.mnemonic=A
checkbox.jobsheets=P\u00E1gina com Banner
checkbox.jobsheets.mnemonic=B
checkbox.printtofile=Imprimir em Arquivo
-checkbox.printtofile.mnemonic=F
+checkbox.printtofile.mnemonic=I
#
dialog.printtitle=Imprimir
dialog.pstitle=Configura\u00E7\u00E3o da P\u00E1gina
@@ -44,33 +44,33 @@
label.pstype=Tipo:
label.rangeto=At\u00E9
label.size=Tamanho:
-label.size.mnemonic=Z
+label.size.mnemonic=M
label.source=Origem:
-label.source.mnemonic=C
+label.source.mnemonic=O
label.status=Status:
label.username=Nome do Usu\u00E1rio:
label.username.mnemonic=U
label.millimetres=(mm)
label.inches=(pol)
label.topmargin=superior
-label.topmargin.mnemonic=T
+label.topmargin.mnemonic=S
label.bottommargin=inferior
-label.bottommargin.mnemonic=B
-label.leftmargin=esquerda
-label.leftmargin.mnemonic=F
+label.bottommargin.mnemonic=I
+label.leftmargin=esquerda:
+label.leftmargin.mnemonic=Q
label.rightmargin=direita
label.rightmargin.mnemonic=R
#
radiobutton.color=Cor
-radiobutton.color.mnemonic=C
+radiobutton.color.mnemonic=O
radiobutton.draftq=Rascunho
-radiobutton.draftq.mnemonic=F
+radiobutton.draftq.mnemonic=R
radiobutton.duplex=Duplex
radiobutton.duplex.mnemonic=D
-radiobutton.highq=Alto
-radiobutton.highq.mnemonic=H
+radiobutton.highq=Alta
+radiobutton.highq.mnemonic=A
radiobutton.landscape=Paisagem
-radiobutton.landscape.mnemonic=L
+radiobutton.landscape.mnemonic=P
radiobutton.monochrome=Monocrom\u00E1tico
radiobutton.monochrome.mnemonic=M
radiobutton.normalq=Normal
@@ -78,31 +78,31 @@
radiobutton.oneside=Um Lado
radiobutton.oneside.mnemonic=O
radiobutton.portrait=Retrato
-radiobutton.portrait.mnemonic=P
-radiobutton.rangeall=Todas
-radiobutton.rangeall.mnemonic=L
+radiobutton.portrait.mnemonic=R
+radiobutton.rangeall=Tudo
+radiobutton.rangeall.mnemonic=U
radiobutton.rangepages=P\u00E1ginas
-radiobutton.rangepages.mnemonic=E
+radiobutton.rangepages.mnemonic=P
radiobutton.revlandscape=Paisagem Invertida
radiobutton.revlandscape.mnemonic=N
radiobutton.revportrait=Retrato Invertido
radiobutton.revportrait.mnemonic=I
-radiobutton.tumble=Duplex Horizontal
-radiobutton.tumble.mnemonic=T
+radiobutton.tumble=Virar
+radiobutton.tumble.mnemonic=V
# The vkMnemonics correspond with the constants defined in KeyEvent, eg
# 65 = KeyEvent.VK_A
tab.appearance=Apar\u00EAncia
tab.appearance.vkMnemonic=65
tab.general=Geral
tab.general.vkMnemonic=71
-tab.pagesetup=Configura\u00E7\u00E3o da P\u00E1gina
-tab.pagesetup.vkMnemonic=83
+tab.pagesetup=Configura\u00E7\u00E3o de P\u00E1gina
+tab.pagesetup.vkMnemonic=80
#
error.pagerange=Faixa de p\u00E1ginas inv\u00E1lida; insira novamente os valores (por exemplo, 1-3,5,7-10)
error.destination=Nome de arquivo inv\u00E1lido; tente novamente
#
# The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound
# character is replaced with 'n')
#
iso-4a0=4A0 (ISO/DIN & JIS)
@@ -207,8 +207,9 @@
Cassette=Cassete
Form-Source=Origem do Formul\u00E1rio
#
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by
# PrinterIsAcceptingJobs.toString()
#
accepting-jobs=Aceitando jobs
not-accepting-jobs=N\u00E3o aceitando jobs
+
--- a/jdk/src/share/classes/sun/print/resources/serviceui_sv.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_sv.properties Mon Apr 11 16:19:20 2011 -0700
@@ -15,14 +15,14 @@
button.ok=OK
button.print=Skriv ut
button.properties=Egenskaper...
-button.properties.mnemonic=H
+button.properties.mnemonic=E
#
checkbox.collate=Sortera
-checkbox.collate.mnemonic=F
+checkbox.collate.mnemonic=S
checkbox.jobsheets=F\u00F6rs\u00E4ttsblad
-checkbox.jobsheets.mnemonic=B
-checkbox.printtofile=Skriv till fil
-checkbox.printtofile.mnemonic=V
+checkbox.jobsheets.mnemonic=F
+checkbox.printtofile=Skriv ut till fil
+checkbox.printtofile.mnemonic=F
#
dialog.printtitle=Skriv ut
dialog.pstitle=Utskriftsformat
@@ -33,39 +33,39 @@
dialog.writeerror=Kan inte skriva till filen:
#
label.info=Information:
-label.jobname=Utskrift:
-label.jobname.mnemonic=U
-label.numcopies=Antal exemplar:
+label.jobname=Jobbnamn
+label.jobname.mnemonic=J
+label.numcopies=Antal exemplar
label.numcopies.mnemonic=E
-label.priority=Prioritet:
-label.priority.mnemonic=H
+label.priority=Prioritet
+label.priority.mnemonic=R
label.psname=Namn:
label.psname.mnemonic=N
label.pstype=Typ:
label.rangeto=Till
label.size=Storlek:
-label.size.mnemonic=o
-label.source=K\u00E4lla:
-label.source.mnemonic=F
+label.size.mnemonic=L
+label.source=K\u00E4lla
+label.source.mnemonic=L
label.status=Status:
label.username=Anv\u00E4ndarnamn:
-label.username.mnemonic=v
+label.username.mnemonic=N
label.millimetres=(mm)
label.inches=(tum)
-label.topmargin=topp
-label.topmargin.mnemonic=V
-label.bottommargin=botten
-label.bottommargin.mnemonic=B
+label.topmargin=\u00F6verkant
+label.topmargin.mnemonic=\
+label.bottommargin=nederkant
+label.bottommargin.mnemonic=N
label.leftmargin=v\u00E4nster
-label.leftmargin.mnemonic=V
+label.leftmargin.mnemonic=\
label.rightmargin=h\u00F6ger
label.rightmargin.mnemonic=H
#
radiobutton.color=F\u00E4rg
radiobutton.color.mnemonic=F
radiobutton.draftq=Utkast
-radiobutton.draftq.mnemonic=V
-radiobutton.duplex=Duplex
+radiobutton.draftq.mnemonic=S
+radiobutton.duplex=Dubbelsidig
radiobutton.duplex.mnemonic=D
radiobutton.highq=H\u00F6g
radiobutton.highq.mnemonic=H
@@ -75,34 +75,34 @@
radiobutton.monochrome.mnemonic=M
radiobutton.normalq=Normal
radiobutton.normalq.mnemonic=N
-radiobutton.oneside=En sida
+radiobutton.oneside=Ensidig
radiobutton.oneside.mnemonic=E
radiobutton.portrait=St\u00E5ende
-radiobutton.portrait.mnemonic=D
+radiobutton.portrait.mnemonic=S
radiobutton.rangeall=Alla
radiobutton.rangeall.mnemonic=L
radiobutton.rangepages=Sidor
-radiobutton.rangepages.mnemonic=D
+radiobutton.rangepages.mnemonic=O
radiobutton.revlandscape=Omv\u00E4nt liggande
-radiobutton.revlandscape.mnemonic=N
+radiobutton.revlandscape.mnemonic=G
radiobutton.revportrait=Omv\u00E4nt st\u00E5ende
-radiobutton.revportrait.mnemonic=M
+radiobutton.revportrait.mnemonic=D
radiobutton.tumble=V\u00E4nd
radiobutton.tumble.mnemonic=V
# The vkMnemonics correspond with the constants defined in KeyEvent, eg
# 65 = KeyEvent.VK_A
-tab.appearance=Utseende
-tab.appearance.vkMnemonic=65
+tab.appearance=Format
+tab.appearance.vkMnemonic=70
tab.general=Allm\u00E4nt
-tab.general.vkMnemonic=71
+tab.general.vkMnemonic=65
tab.pagesetup=Utskriftsformat
-tab.pagesetup.vkMnemonic=83
+tab.pagesetup.vkMnemonic=70
#
error.pagerange=Ogiltigt sidintervall. Skriv in v\u00E4rdena igen (t ex 1-3,5,7-10)
error.destination=Ogiltigt filnamn. F\u00F6rs\u00F6k igen.
#
# The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound
# character is replaced with 'n')
#
iso-4a0=4A0 (ISO/DIN & JIS)
@@ -207,8 +207,9 @@
Cassette=Kassett
Form-Source=Formul\u00E4rk\u00E4lla
#
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by
# PrinterIsAcceptingJobs.toString()
#
accepting-jobs=Accepterar jobb
not-accepting-jobs=Accepterar inte jobb
+
--- a/jdk/src/share/classes/sun/print/resources/serviceui_zh_CN.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_zh_CN.properties Mon Apr 11 16:19:20 2011 -0700
@@ -14,14 +14,14 @@
button.cancel=\u53D6\u6D88
button.ok=\u786E\u5B9A
button.print=\u6253\u5370
-button.properties=\u5C5E\u6027...
+button.properties=\u5C5E\u6027(R)...
button.properties.mnemonic=R
#
-checkbox.collate=\u9010\u4EFD\u6253\u5370
+checkbox.collate=\u9010\u4EFD\u6253\u5370(C)
checkbox.collate.mnemonic=C
-checkbox.jobsheets=\u6807\u5E1C\u9875
+checkbox.jobsheets=\u6807\u5E1C\u9875(B)
checkbox.jobsheets.mnemonic=B
-checkbox.printtofile=\u6253\u5370\u5230\u6587\u4EF6
+checkbox.printtofile=\u6253\u5370\u5230\u6587\u4EF6(F)
checkbox.printtofile.mnemonic=F
#
dialog.printtitle=\u6253\u5370
@@ -32,77 +32,77 @@
dialog.noprintermsg=\u627E\u4E0D\u5230\u6253\u5370\u670D\u52A1\u3002
dialog.writeerror=\u65E0\u6CD5\u5199\u5165\u6587\u4EF6:
#
-label.info=\u4FE1\u606F:
-label.jobname=\u4F5C\u4E1A\u540D\u79F0:
+label.info=\u4FE1\u606F:
+label.jobname=\u4F5C\u4E1A\u540D(J):
label.jobname.mnemonic=J
-label.numcopies=\u6253\u5370\u4EFD\u6570:
+label.numcopies=\u6253\u5370\u4EFD\u6570(O):
label.numcopies.mnemonic=O
-label.priority=\u4F18\u5148\u7EA7:
+label.priority=\u4F18\u5148\u7EA7(R):
label.priority.mnemonic=R
-label.psname=\u540D\u79F0:
+label.psname=\u540D\u79F0(N):
label.psname.mnemonic=N
-label.pstype=\u7C7B\u578B:
+label.pstype=\u7C7B\u578B:
label.rangeto=\u81F3
-label.size=\u5927\u5C0F:
+label.size=\u5927\u5C0F(Z):
label.size.mnemonic=Z
-label.source=\u6765\u6E90:
+label.source=\u6765\u6E90(C):
label.source.mnemonic=C
-label.status=\u72B6\u6001:
-label.username=\u7528\u6237\u540D:
+label.status=\u72B6\u6001:
+label.username=\u7528\u6237\u540D(U):
label.username.mnemonic=U
label.millimetres=(\u6BEB\u7C73)
label.inches=(\u82F1\u5BF8)
-label.topmargin=\u4E0A\u8FB9\u8DDD
+label.topmargin=\u4E0A\u8FB9\u8DDD(T)
label.topmargin.mnemonic=T
-label.bottommargin=\u4E0B\u8FB9\u8DDD
+label.bottommargin=\u4E0B\u8FB9\u8DDD(B)
label.bottommargin.mnemonic=B
-label.leftmargin=\u5DE6\u8FB9\u8DDD
+label.leftmargin=\u5DE6\u8FB9\u8DDD(F)
label.leftmargin.mnemonic=F
-label.rightmargin=\u53F3\u8FB9\u8DDD
+label.rightmargin=\u53F3\u8FB9\u8DDD(R)
label.rightmargin.mnemonic=R
#
-radiobutton.color=\u989C\u8272
+radiobutton.color=\u989C\u8272(C)
radiobutton.color.mnemonic=C
-radiobutton.draftq=\u8349\u56FE
+radiobutton.draftq=\u8349\u56FE(F)
radiobutton.draftq.mnemonic=F
-radiobutton.duplex=\u53CC\u9762\u6253\u5370
+radiobutton.duplex=\u53CC\u9762\u6253\u5370(D)
radiobutton.duplex.mnemonic=D
-radiobutton.highq=\u9AD8
+radiobutton.highq=\u9AD8(H)
radiobutton.highq.mnemonic=H
-radiobutton.landscape=\u6A2A\u5411
+radiobutton.landscape=\u6A2A\u5411(L)
radiobutton.landscape.mnemonic=L
-radiobutton.monochrome=\u5355\u8272
+radiobutton.monochrome=\u5355\u8272(M)
radiobutton.monochrome.mnemonic=M
-radiobutton.normalq=\u6B63\u5E38
+radiobutton.normalq=\u6B63\u5E38(N)
radiobutton.normalq.mnemonic=N
-radiobutton.oneside=\u5355\u9762
+radiobutton.oneside=\u5355\u9762(O)
radiobutton.oneside.mnemonic=O
-radiobutton.portrait=\u7EB5\u5411
+radiobutton.portrait=\u7EB5\u5411(P)
radiobutton.portrait.mnemonic=P
-radiobutton.rangeall=\u5168\u90E8
+radiobutton.rangeall=\u5168\u90E8(L)
radiobutton.rangeall.mnemonic=L
-radiobutton.rangepages=\u9875\u7801\u8303\u56F4
+radiobutton.rangepages=\u9875\u7801\u8303\u56F4(E)
radiobutton.rangepages.mnemonic=E
-radiobutton.revlandscape=\u6A2A\u5411\u53CD\u9762\u6253\u5370
+radiobutton.revlandscape=\u6A2A\u5411\u53CD\u9762\u6253\u5370(N)
radiobutton.revlandscape.mnemonic=N
-radiobutton.revportrait=\u7EB5\u5411\u53CD\u9762\u6253\u5370
+radiobutton.revportrait=\u7EB5\u5411\u53CD\u9762\u6253\u5370(I)
radiobutton.revportrait.mnemonic=I
-radiobutton.tumble=\u7FFB\u8F6C
+radiobutton.tumble=\u7FFB\u8F6C(T)
radiobutton.tumble.mnemonic=T
# The vkMnemonics correspond with the constants defined in KeyEvent, eg
# 65 = KeyEvent.VK_A
-tab.appearance=\u5916\u89C2
+tab.appearance=\u5916\u89C2(A)
tab.appearance.vkMnemonic=65
-tab.general=\u5E38\u89C4
+tab.general=\u4E00\u822C\u4FE1\u606F(G)
tab.general.vkMnemonic=71
-tab.pagesetup=\u9875\u9762\u8BBE\u7F6E
+tab.pagesetup=\u9875\u9762\u8BBE\u7F6E(S)
tab.pagesetup.vkMnemonic=83
#
error.pagerange=\u65E0\u6548\u7684\u9875\u9762\u8303\u56F4; \u8BF7\u91CD\u65B0\u8F93\u5165\u6570\u503C (\u4F8B\u5982 1-3,5,7-10)
error.destination=\u65E0\u6548\u7684\u6587\u4EF6\u540D; \u8BF7\u91CD\u8BD5
#
# The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound
# character is replaced with 'n')
#
iso-4a0=4A0 (ISO/DIN & JIS)
@@ -207,8 +207,9 @@
Cassette=\u7EB8\u76D2
Form-Source=\u8868\u683C\u6765\u6E90
#
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by
# PrinterIsAcceptingJobs.toString()
#
accepting-jobs=\u63A5\u53D7\u4F5C\u4E1A
not-accepting-jobs=\u4E0D\u63A5\u53D7\u4F5C\u4E1A
+
--- a/jdk/src/share/classes/sun/print/resources/serviceui_zh_TW.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_zh_TW.properties Mon Apr 11 16:19:20 2011 -0700
@@ -14,7 +14,7 @@
button.cancel=\u53D6\u6D88
button.ok=\u78BA\u5B9A
button.print=\u5217\u5370
-button.properties=\u5C6C\u6027(R)...
+button.properties=\u7279\u6027(R)...
button.properties.mnemonic=R
#
checkbox.collate=\u7406\u5E8F(C)
@@ -32,23 +32,23 @@
dialog.noprintermsg=\u627E\u4E0D\u5230\u5217\u5370\u670D\u52D9\u3002
dialog.writeerror=\u7121\u6CD5\u5BEB\u5165\u81F3\u6A94\u6848:
#
-label.info=\u8CC7\u8A0A:
-label.jobname=\u5DE5\u4F5C\u540D\u7A31(J):
+label.info=\u8CC7\u8A0A:
+label.jobname=\u5DE5\u4F5C\u540D\u7A31(J):
label.jobname.mnemonic=J
-label.numcopies=\u5217\u5370\u4EFD\u6578(O):
+label.numcopies=\u5217\u5370\u4EFD\u6578(O):
label.numcopies.mnemonic=O
-label.priority=\u512A\u5148\u6B0A(R):
+label.priority=\u512A\u5148\u6B0A(R):
label.priority.mnemonic=R
-label.psname=\u540D\u7A31(N):
+label.psname=\u540D\u7A31(N):
label.psname.mnemonic=N
-label.pstype=\u985E\u578B:
+label.pstype=\u985E\u578B:
label.rangeto=\u81F3
-label.size=\u5927\u5C0F(Z):
+label.size=\u5927\u5C0F(Z):
label.size.mnemonic=Z
-label.source=\u4F86\u6E90(C):
+label.source=\u4F86\u6E90(C):
label.source.mnemonic=C
-label.status=\u72C0\u614B:
-label.username=\u4F7F\u7528\u8005\u540D\u7A31(U):
+label.status=\u72C0\u614B:
+label.username=\u4F7F\u7528\u8005\u540D\u7A31(U):
label.username.mnemonic=U
label.millimetres=(mm)
label.inches=(in)
@@ -61,9 +61,9 @@
label.rightmargin=\u53F3\u908A\u8DDD(R)
label.rightmargin.mnemonic=R
#
-radiobutton.color=\u8272\u5F69(C)
+radiobutton.color=\u984F\u8272(C)
radiobutton.color.mnemonic=C
-radiobutton.draftq=\u8349\u5716(F)
+radiobutton.draftq=\u8349\u7A3F(F)
radiobutton.draftq.mnemonic=F
radiobutton.duplex=\u96D9\u9762\u5217\u5370(D)
radiobutton.duplex.mnemonic=D
@@ -91,18 +91,18 @@
radiobutton.tumble.mnemonic=T
# The vkMnemonics correspond with the constants defined in KeyEvent, eg
# 65 = KeyEvent.VK_A
-tab.appearance=\u5916\u89C0
+tab.appearance=\u5916\u89C0(A)
tab.appearance.vkMnemonic=65
-tab.general=\u4E00\u822C
+tab.general=\u4E00\u822C(G)
tab.general.vkMnemonic=71
-tab.pagesetup=\u9801\u9762\u8A2D\u5B9A
+tab.pagesetup=\u9801\u9762\u8A2D\u5B9A(S)
tab.pagesetup.vkMnemonic=83
#
error.pagerange=\u7121\u6548\u7684\u9801\u9762\u7BC4\u570D; \u8ACB\u91CD\u65B0\u8F38\u5165\u6578\u503C (\u4F8B\u5982 1-3,5,7-10)
error.destination=\u7121\u6548\u7684\u6A94\u540D; \u8ACB\u518D\u8A66\u4E00\u6B21
#
# The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound
# character is replaced with 'n')
#
iso-4a0=4A0 (ISO/DIN & JIS)
@@ -207,8 +207,9 @@
Cassette=\u5361\u5F0F\u78C1\u5E36\u6A5F
Form-Source=\u8868\u683C\u4F86\u6E90
#
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by
# PrinterIsAcceptingJobs.toString()
#
accepting-jobs=\u63A5\u53D7\u7684\u5DE5\u4F5C
not-accepting-jobs=\u4E0D\u63A5\u53D7\u7684\u5DE5\u4F5C
+
--- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_de.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_de.properties Mon Apr 11 16:19:20 2011 -0700
@@ -81,16 +81,16 @@
rmid.daemon.shutdown=Aktivierungsdaemon heruntergefahren
# "rmid" should not be translated
-rmid.restart.group.warning=\nrmid: (WARNING) Neustart der Gruppe l\u00F6st Folgendes aus:
+rmid.restart.group.warning=\nrmid: (WARNUNG) Neustart der Gruppe l\u00F6st Folgendes aus:
# "rmid" should not be translated
-rmid.restart.service.warning=\nrmid: (WARNING) Neustart des Service l\u00F6st Folgendes aus:
+rmid.restart.service.warning=\nrmid: (WARNUNG) Neustart des Service l\u00F6st Folgendes aus:
# "rmid" should not be translated
-rmid.log.update.warning=\nrmid: (WARNING) Logupdate l\u00F6st Folgendes aus:
+rmid.log.update.warning=\nrmid: (WARNUNG) Logupdate l\u00F6st Folgendes aus:
# "rmid" should not be translated
-rmid.log.snapshot.warning=\nrmid: (SEVERE) Log-Snapshot l\u00F6st Folgendes aus:
+rmid.log.snapshot.warning=\nrmid: (SCHWERWIEGEND) Log-Snapshot l\u00F6st Folgendes aus:
# "rmid" should not be translated
-rmid.log.recover.warning=\nrmid: (WARNING) {0}: Logdatensatz wird bei Wiederherstellung \u00FCbersprungen:
+rmid.log.recover.warning=\nrmid: (WARNUNG) {0}: Logdatensatz wird bei Wiederherstellung \u00FCbersprungen:
--- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_sv.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_sv.properties Mon Apr 11 16:19:20 2011 -0700
@@ -81,16 +81,16 @@
rmid.daemon.shutdown=aktiveringsdemonen avslutas
# "rmid" should not be translated
-rmid.restart.group.warning=\nrmid: (VARNING) starta om gruppkast:
+rmid.restart.group.warning=\nrmid: (Varning) starta om gruppkast:
# "rmid" should not be translated
-rmid.restart.service.warning=\nrmid: (VARNING) starta om tj\u00E4nstekast:
+rmid.restart.service.warning=\nrmid: (Varning) starta om tj\u00E4nstekast:
# "rmid" should not be translated
-rmid.log.update.warning=\nrmid: (VARNING) logga uppdateringskast:
+rmid.log.update.warning=\nrmid: (Varning) logga uppdateringskast:
# "rmid" should not be translated
-rmid.log.snapshot.warning=\nrmid: (ALLVARLIGT) logga \u00F6gonblickskast:
+rmid.log.snapshot.warning=\nrmid: (Allvarligt) logga \u00F6gonblickskast:
# "rmid" should not be translated
-rmid.log.recover.warning=\nrmid: (VARNING) {0}: hoppar \u00F6ver loggpost under \u00E5terst\u00E4llning:
+rmid.log.recover.warning=\nrmid: (Varning) {0}: hoppar \u00F6ver loggpost under \u00E5terst\u00E4llning:
--- a/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_ja.java Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_ja.java Mon Apr 11 16:19:20 2011 -0700
@@ -102,9 +102,9 @@
{"CPU Usage","CPU\u4F7F\u7528\u7387"},
{"CPUUsageFormat","CPU\u4F7F\u7528\u7387: {0}%"},
{"Cancel","\u53D6\u6D88"},
- {"Cascade", "\u91CD\u306D\u3066\u8868\u793A"},
+ {"Cascade", "\u91CD\u306D\u3066\u8868\u793A(C)"},
{"Cascade.mnemonic", "C"},
- {"Chart:", "\u30C1\u30E3\u30FC\u30C8:"},
+ {"Chart:", "\u30C1\u30E3\u30FC\u30C8(C):"},
{"Chart:.mnemonic", "C"},
{"Class path","\u30AF\u30E9\u30B9\u30D1\u30B9"},
{"Class","\u30AF\u30E9\u30B9"},
@@ -121,7 +121,7 @@
{"Compiler","\u30B3\u30F3\u30D1\u30A4\u30E9"},
{"CompositeData","CompositeData"},
{"Config","\u69CB\u6210"},
- {"Connect", "\u63A5\u7D9A"},
+ {"Connect", "\u63A5\u7D9A(C)"},
{"Connect.mnemonic", "C"},
{"Connect...","\u63A5\u7D9A..."},
{"ConnectDialog.connectButton.toolTip", "Java\u4EEE\u60F3\u30DE\u30B7\u30F3\u306B\u63A5\u7D9A"},
@@ -132,7 +132,7 @@
{"ConnectDialog.title", "JConsole: \u65B0\u898F\u63A5\u7D9A"},
{"Connected. Click to disconnect.","\u63A5\u7D9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u5207\u65AD\u3057\u307E\u3059\u3002"},
{"Connection failed","\u63A5\u7D9A\u306B\u5931\u6557\u3057\u307E\u3057\u305F"},
- {"Connection", "\u63A5\u7D9A"},
+ {"Connection", "\u63A5\u7D9A(C)"},
{"Connection.mnemonic", "C"},
{"Connection name", "\u63A5\u7D9A\u540D"},
{"ConnectionName (disconnected)","{0} (\u5207\u65AD\u6E08)"},
@@ -149,7 +149,7 @@
{"Description: ", "\u8AAC\u660E: "},
{"Descriptor", "\u8A18\u8FF0\u5B50"},
{"Details", "\u8A73\u7D30"},
- {"Detect Deadlock", "\u30C7\u30C3\u30C9\u30ED\u30C3\u30AF\u306E\u691C\u51FA"},
+ {"Detect Deadlock", "\u30C7\u30C3\u30C9\u30ED\u30C3\u30AF\u306E\u691C\u51FA(D)"},
{"Detect Deadlock.mnemonic", "D"},
{"Detect Deadlock.toolTip", "\u30C7\u30C3\u30C9\u30ED\u30C3\u30AF\u6E08\u30B9\u30EC\u30C3\u30C9\u306E\u691C\u51FA"},
{"Dimension is not supported:","\u6B21\u5143\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093:"},
@@ -167,7 +167,7 @@
{"Error: MBeans do not exist","\u30A8\u30E9\u30FC: MBeans\u306F\u5B58\u5728\u3057\u307E\u305B\u3093"},
{"Error:","\u30A8\u30E9\u30FC:"},
{"Event","\u30A4\u30D9\u30F3\u30C8"},
- {"Exit", "\u7D42\u4E86"},
+ {"Exit", "\u7D42\u4E86(X)"},
{"Exit.mnemonic", "X"},
{"Fail to load plugin", "\u8B66\u544A: \u30D7\u30E9\u30B0\u30A4\u30F3\u306E\u30ED\u30FC\u30C9\u306B\u5931\u6557\u3057\u307E\u3057\u305F: {0}"},
{"FileChooser.fileExists.cancelOption", "\u53D6\u6D88"},
@@ -192,16 +192,16 @@
{"Help.AboutDialog.masthead.accessibleName", "\u30DE\u30B9\u30C8\u30D8\u30C3\u30C9\u56F3\u5F62"},
{"Help.AboutDialog.masthead.title", "JConsole\u306B\u3064\u3044\u3066"},
{"Help.AboutDialog.title", "JConsole: \u8A73\u7D30"},
- {"Help.AboutDialog.userGuideLink", "JConsole\u30E6\u30FC\u30B6\u30FC\u30FB\u30AC\u30A4\u30C9:<br>{0}"},
+ {"Help.AboutDialog.userGuideLink", "JConsole\u30E6\u30FC\u30B6\u30FC\u30FB\u30AC\u30A4\u30C9(U):<br>{0}"},
{"Help.AboutDialog.userGuideLink.mnemonic", "U"},
{"Help.AboutDialog.userGuideLink.url", "http://java.sun.com/javase/6/docs/technotes/guides/management/jconsole.html"},
- {"HelpMenu.About.title", "JConsole\u306B\u3064\u3044\u3066"},
+ {"HelpMenu.About.title", "JConsole\u306B\u3064\u3044\u3066(A)"},
{"HelpMenu.About.title.mnemonic", "A"},
- {"HelpMenu.UserGuide.title", "\u30AA\u30F3\u30E9\u30A4\u30F3\u30FB\u30E6\u30FC\u30B6\u30FC\u30FB\u30AC\u30A4\u30C9"},
+ {"HelpMenu.UserGuide.title", "\u30AA\u30F3\u30E9\u30A4\u30F3\u30FB\u30E6\u30FC\u30B6\u30FC\u30FB\u30AC\u30A4\u30C9(U)"},
{"HelpMenu.UserGuide.title.mnemonic", "U"},
- {"HelpMenu.title", "\u30D8\u30EB\u30D7"},
+ {"HelpMenu.title", "\u30D8\u30EB\u30D7(H)"},
{"HelpMenu.title.mnemonic", "H"},
- {"Hotspot MBeans...", "Hotspot MBeans..."},
+ {"Hotspot MBeans...", "Hotspot MBeans(H)..."},
{"Hotspot MBeans....mnemonic", "H"},
{"Hotspot MBeans.dialog.accessibleDescription", "Hotspot MBeans\u306E\u7BA1\u7406\u7528\u30C0\u30A4\u30A2\u30ED\u30B0"},
{"Impact","\u5F71\u97FF"},
@@ -221,7 +221,7 @@
{"Listeners","\u30EA\u30B9\u30CA\u30FC"},
{"Live Threads","\u5B9F\u884C\u4E2D\u306E\u30B9\u30EC\u30C3\u30C9"},
{"Loaded", "\u30ED\u30FC\u30C9\u6E08"},
- {"Local Process:", "\u30ED\u30FC\u30AB\u30EB\u30FB\u30D7\u30ED\u30BB\u30B9:"},
+ {"Local Process:", "\u30ED\u30FC\u30AB\u30EB\u30FB\u30D7\u30ED\u30BB\u30B9(L):"},
{"Local Process:.mnemonic", "L"},
{"Look and Feel","Look&Feel"},
{"Masthead.font", "Dialog-PLAIN-25"},
@@ -232,20 +232,20 @@
{"MBeanNotificationInfo","MBeanNotificationInfo"},
{"MBeanOperationInfo","MBeanOperationInfo"},
{"MBeans","MBeans"},
- {"MBeansTab.clearNotificationsButton", "\u30AF\u30EA\u30A2"},
+ {"MBeansTab.clearNotificationsButton", "\u30AF\u30EA\u30A2(C)"},
{"MBeansTab.clearNotificationsButton.mnemonic", "C"},
{"MBeansTab.clearNotificationsButton.toolTip", "\u901A\u77E5\u306E\u30AF\u30EA\u30A2"},
{"MBeansTab.compositeNavigationMultiple", "\u30B3\u30F3\u30DD\u30B8\u30C3\u30C8\u30FB\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3{0}/{1}"},
{"MBeansTab.compositeNavigationSingle", "\u30B3\u30F3\u30DD\u30B8\u30C3\u30C8\u30FB\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3"},
- {"MBeansTab.refreshAttributesButton", "\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5"},
+ {"MBeansTab.refreshAttributesButton", "\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5(R)"},
{"MBeansTab.refreshAttributesButton.mnemonic", "R"},
{"MBeansTab.refreshAttributesButton.toolTip", "\u5C5E\u6027\u306E\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5"},
- {"MBeansTab.subscribeNotificationsButton", "\u30B5\u30D6\u30B9\u30AF\u30E9\u30A4\u30D6"},
+ {"MBeansTab.subscribeNotificationsButton", "\u30B5\u30D6\u30B9\u30AF\u30E9\u30A4\u30D6(S)"},
{"MBeansTab.subscribeNotificationsButton.mnemonic", "S"},
{"MBeansTab.subscribeNotificationsButton.toolTip", "\u901A\u77E5\u30EA\u30B9\u30CB\u30F3\u30B0\u306E\u958B\u59CB"},
{"MBeansTab.tabularNavigationMultiple", "\u30BF\u30D6\u30FB\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3{0}/{1}"},
{"MBeansTab.tabularNavigationSingle", "\u30BF\u30D6\u30FB\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3"},
- {"MBeansTab.unsubscribeNotificationsButton", "\u30B5\u30D6\u30B9\u30AF\u30E9\u30A4\u30D6\u89E3\u9664"},
+ {"MBeansTab.unsubscribeNotificationsButton", "\u30B5\u30D6\u30B9\u30AF\u30E9\u30A4\u30D6\u89E3\u9664(U)"},
{"MBeansTab.unsubscribeNotificationsButton.mnemonic", "U"},
{"MBeansTab.unsubscribeNotificationsButton.toolTip", "\u901A\u77E5\u30EA\u30B9\u30CB\u30F3\u30B0\u306E\u505C\u6B62"},
{"Manage Hotspot MBeans in: ", "Hotspot MBeans\u306E\u7BA1\u7406: "},
@@ -262,7 +262,7 @@
{"MemoryTab.poolPlotter.accessibleName", "{0}\u306E\u30E1\u30E2\u30EA\u30FC\u4F7F\u7528\u7387\u30C1\u30E3\u30FC\u30C8\u3002"},
{"Message","\u30E1\u30C3\u30BB\u30FC\u30B8"},
{"Method successfully invoked", "\u30E1\u30BD\u30C3\u30C9\u304C\u6B63\u5E38\u306B\u8D77\u52D5\u3055\u308C\u307E\u3057\u305F"},
- {"Minimize All", "\u3059\u3079\u3066\u6700\u5C0F\u5316"},
+ {"Minimize All", "\u3059\u3079\u3066\u6700\u5C0F\u5316(M)"},
{"Minimize All.mnemonic", "M"},
{"Minus Version", "\u3053\u308C\u306F{0}\u306E\u30D0\u30FC\u30B8\u30E7\u30F3{1}\u3067\u3059"},
{"Monitor locked",
@@ -278,7 +278,7 @@
"\u540D\u524D: {0}\n\u72B6\u614B: {2}\u306E{1}\n"},
{"Name State LockName LockOwner",
"\u540D\u524D: {0}\n\u72B6\u614B: {2}\u306E{1}\u3001\u6240\u6709\u8005: {3}\n"},
- {"New Connection...", "\u65B0\u898F\u63A5\u7D9A..."},
+ {"New Connection...", "\u65B0\u898F\u63A5\u7D9A(N)..."},
{"New Connection....mnemonic", "N"},
{"New value applied","\u9069\u7528\u3055\u308C\u305F\u65B0\u898F\u5024"},
{"No attribute selected","\u5C5E\u6027\u304C\u9078\u629E\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F"},
@@ -304,19 +304,19 @@
{"Overview","\u6982\u8981"},
{"OverviewPanel.plotter.accessibleName", "{0}\u306E\u30C1\u30E3\u30FC\u30C8\u3002"},
{"Parameter", "\u30D1\u30E9\u30E1\u30FC\u30BF"},
- {"Password: ", "\u30D1\u30B9\u30EF\u30FC\u30C9: "},
+ {"Password: ", "\u30D1\u30B9\u30EF\u30FC\u30C9(P): "},
{"Password: .mnemonic", "P"},
{"Password.accessibleName", "\u30D1\u30B9\u30EF\u30FC\u30C9"},
{"Peak","\u30D4\u30FC\u30AF"},
- {"Perform GC", "GC\u306E\u5B9F\u884C"},
+ {"Perform GC", "GC\u306E\u5B9F\u884C(G)"},
{"Perform GC.mnemonic", "G"},
{"Perform GC.toolTip", "\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u306E\u30EA\u30AF\u30A8\u30B9\u30C8"},
{"Plotter.accessibleName", "\u30C1\u30E3\u30FC\u30C8"},
{"Plotter.accessibleName.keyAndValue", "{0}={1}\n"},
{"Plotter.accessibleName.noData", "\u30C7\u30FC\u30BF\u304C\u30D7\u30ED\u30C3\u30C8\u3055\u308C\u307E\u305B\u3093\u3002"},
- {"Plotter.saveAsMenuItem", "\u540D\u524D\u3092\u4ED8\u3051\u3066\u30C7\u30FC\u30BF\u3092\u4FDD\u5B58..."},
+ {"Plotter.saveAsMenuItem", "\u540D\u524D\u3092\u4ED8\u3051\u3066\u30C7\u30FC\u30BF\u3092\u4FDD\u5B58(A)..."},
{"Plotter.saveAsMenuItem.mnemonic", "A"},
- {"Plotter.timeRangeMenu", "\u6642\u9593\u7BC4\u56F2"},
+ {"Plotter.timeRangeMenu", "\u6642\u9593\u7BC4\u56F2(T)"},
{"Plotter.timeRangeMenu.mnemonic", "T"},
{"Problem adding listener","\u30EA\u30B9\u30CA\u30FC\u8FFD\u52A0\u4E2D\u306E\u554F\u984C"},
{"Problem displaying MBean", "MBean\u8868\u793A\u4E2D\u306E\u554F\u984C"},
@@ -328,11 +328,11 @@
{"Readable","\u8AAD\u53D6\u308A\u53EF\u80FD"},
{"Received","\u53D7\u4FE1\u6E08"},
{"Reconnect","\u518D\u63A5\u7D9A"},
- {"Remote Process:", "\u30EA\u30E2\u30FC\u30C8\u30FB\u30D7\u30ED\u30BB\u30B9:"},
+ {"Remote Process:", "\u30EA\u30E2\u30FC\u30C8\u30FB\u30D7\u30ED\u30BB\u30B9(R):"},
{"Remote Process:.mnemonic", "R"},
{"Remote Process.textField.accessibleName", "\u30EA\u30E2\u30FC\u30C8\u30FB\u30D7\u30ED\u30BB\u30B9"},
{"Remove","\u524A\u9664"},
- {"Restore All", "\u3059\u3079\u3066\u5FA9\u5143"},
+ {"Restore All", "\u3059\u3079\u3066\u5FA9\u5143(R)"},
{"Restore All.mnemonic", "R"},
{"Return value", "\u623B\u308A\u5024"},
{"ReturnType", "ReturnType"},
@@ -363,9 +363,9 @@
{"ThreadTab.threadInfo.accessibleName", "\u30B9\u30EC\u30C3\u30C9\u60C5\u5831"},
{"ThreadTab.threadPlotter.accessibleName", "\u30B9\u30EC\u30C3\u30C9\u6570\u306E\u30C1\u30E3\u30FC\u30C8\u3002"},
{"Threshold","\u3057\u304D\u3044\u5024"},
- {"Tile", "\u4E26\u3079\u3066\u8868\u793A"},
+ {"Tile", "\u4E26\u3079\u3066\u8868\u793A(T)"},
{"Tile.mnemonic", "T"},
- {"Time Range:", "\u6642\u9593\u7BC4\u56F2:"},
+ {"Time Range:", "\u6642\u9593\u7BC4\u56F2(T):"},
{"Time Range:.mnemonic", "T"},
{"Time", "\u6642\u9593"},
{"TimeStamp","TimeStamp"},
@@ -386,7 +386,7 @@
{"Usage Threshold","\u4F7F\u7528\u3057\u304D\u3044\u5024"},
{"remoteTF.usage","<b>\u4F7F\u7528\u65B9\u6CD5</b>: <hostname>:<port>\u307E\u305F\u306Fservice:jmx:<protocol>:<sap>"},
{"Used","\u4F7F\u7528\u6E08"},
- {"Username: ", "\u30E6\u30FC\u30B6\u30FC\u540D: "},
+ {"Username: ", "\u30E6\u30FC\u30B6\u30FC\u540D(U): "},
{"Username: .mnemonic", "U"},
{"Username.accessibleName", "\u30E6\u30FC\u30B6\u30FC\u540D"},
{"UserData","UserData"},
--- a/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_zh_CN.java Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_zh_CN.java Mon Apr 11 16:19:20 2011 -0700
@@ -102,9 +102,9 @@
{"CPU Usage","CPU \u5360\u7528\u7387"},
{"CPUUsageFormat","CPU \u5360\u7528\u7387: {0}%"},
{"Cancel","\u53D6\u6D88"},
- {"Cascade", "\u7EA7\u8054"},
+ {"Cascade", "\u7EA7\u8054(C)"},
{"Cascade.mnemonic", "C"},
- {"Chart:", "\u56FE\u8868:"},
+ {"Chart:", "\u56FE\u8868(C):"},
{"Chart:.mnemonic", "C"},
{"Class path","\u7C7B\u8DEF\u5F84"},
{"Class","\u7C7B"},
@@ -121,7 +121,7 @@
{"Compiler","\u7F16\u8BD1\u5668"},
{"CompositeData","CompositeData"},
{"Config","\u914D\u7F6E"},
- {"Connect", "\u8FDE\u63A5"},
+ {"Connect", "\u8FDE\u63A5(C)"},
{"Connect.mnemonic", "C"},
{"Connect...","\u8FDE\u63A5..."},
{"ConnectDialog.connectButton.toolTip", "\u8FDE\u63A5\u5230 Java \u865A\u62DF\u673A"},
@@ -132,7 +132,7 @@
{"ConnectDialog.title", "JConsole: \u65B0\u5EFA\u8FDE\u63A5"},
{"Connected. Click to disconnect.","\u5DF2\u8FDE\u63A5\u3002\u5355\u51FB\u53EF\u65AD\u5F00\u8FDE\u63A5\u3002"},
{"Connection failed","\u8FDE\u63A5\u5931\u8D25"},
- {"Connection", "\u8FDE\u63A5"},
+ {"Connection", "\u8FDE\u63A5(C)"},
{"Connection.mnemonic", "C"},
{"Connection name", "\u8FDE\u63A5\u540D\u79F0"},
{"ConnectionName (disconnected)","{0} (\u5DF2\u65AD\u5F00\u8FDE\u63A5)"},
@@ -149,7 +149,7 @@
{"Description: ", "\u8BF4\u660E: "},
{"Descriptor", "\u63CF\u8FF0\u7B26"},
{"Details", "\u8BE6\u7EC6\u8D44\u6599"},
- {"Detect Deadlock", "\u68C0\u6D4B\u6B7B\u9501"},
+ {"Detect Deadlock", "\u68C0\u6D4B\u6B7B\u9501(D)"},
{"Detect Deadlock.mnemonic", "D"},
{"Detect Deadlock.toolTip", "\u68C0\u6D4B\u5904\u4E8E\u6B7B\u9501\u72B6\u6001\u7684\u7EBF\u7A0B"},
{"Dimension is not supported:","\u4E0D\u652F\u6301\u7EF4:"},
@@ -167,7 +167,7 @@
{"Error: MBeans do not exist","\u9519\u8BEF: MBean \u4E0D\u5B58\u5728"},
{"Error:","\u9519\u8BEF:"},
{"Event","\u4E8B\u4EF6"},
- {"Exit", "\u9000\u51FA"},
+ {"Exit", "\u9000\u51FA(X)"},
{"Exit.mnemonic", "X"},
{"Fail to load plugin", "\u8B66\u544A: \u65E0\u6CD5\u52A0\u8F7D\u63D2\u4EF6: {0}"},
{"FileChooser.fileExists.cancelOption", "\u53D6\u6D88"},
@@ -192,16 +192,16 @@
{"Help.AboutDialog.masthead.accessibleName", "\u62A5\u5934\u56FE"},
{"Help.AboutDialog.masthead.title", "\u5173\u4E8E JConsole"},
{"Help.AboutDialog.title", "JConsole: \u5173\u4E8E"},
- {"Help.AboutDialog.userGuideLink", "JConsole \u7528\u6237\u6307\u5357:<br>{0}"},
+ {"Help.AboutDialog.userGuideLink", "JConsole \u7528\u6237\u6307\u5357(U):<br>{0}"},
{"Help.AboutDialog.userGuideLink.mnemonic", "U"},
{"Help.AboutDialog.userGuideLink.url", "http://java.sun.com/javase/6/docs/technotes/guides/management/jconsole.html"},
- {"HelpMenu.About.title", "\u5173\u4E8E JConsole"},
+ {"HelpMenu.About.title", "\u5173\u4E8E JConsole(A)"},
{"HelpMenu.About.title.mnemonic", "A"},
- {"HelpMenu.UserGuide.title", "\u8054\u673A\u7528\u6237\u6307\u5357"},
+ {"HelpMenu.UserGuide.title", "\u8054\u673A\u7528\u6237\u6307\u5357(U)"},
{"HelpMenu.UserGuide.title.mnemonic", "U"},
- {"HelpMenu.title", "\u5E2E\u52A9"},
+ {"HelpMenu.title", "\u5E2E\u52A9(H)"},
{"HelpMenu.title.mnemonic", "H"},
- {"Hotspot MBeans...", "\u70ED\u70B9 MBean..."},
+ {"Hotspot MBeans...", "\u70ED\u70B9 MBean(H)..."},
{"Hotspot MBeans....mnemonic", "H"},
{"Hotspot MBeans.dialog.accessibleDescription", "\u7528\u4E8E\u7BA1\u7406\u70ED\u70B9 MBean \u7684\u5BF9\u8BDD\u6846"},
{"Impact","\u5F71\u54CD"},
@@ -221,7 +221,7 @@
{"Listeners","\u76D1\u542C\u7A0B\u5E8F"},
{"Live Threads","\u6D3B\u52A8\u7EBF\u7A0B"},
{"Loaded", "\u5DF2\u52A0\u8F7D"},
- {"Local Process:", "\u672C\u5730\u8FDB\u7A0B:"},
+ {"Local Process:", "\u672C\u5730\u8FDB\u7A0B(L):"},
{"Local Process:.mnemonic", "L"},
{"Look and Feel","\u5916\u89C2"},
{"Masthead.font", "Dialog-PLAIN-25"},
@@ -232,20 +232,20 @@
{"MBeanNotificationInfo","MBeanNotificationInfo"},
{"MBeanOperationInfo","MBeanOperationInfo"},
{"MBeans","MBean"},
- {"MBeansTab.clearNotificationsButton", "\u6E05\u9664"},
+ {"MBeansTab.clearNotificationsButton", "\u6E05\u9664(C)"},
{"MBeansTab.clearNotificationsButton.mnemonic", "C"},
{"MBeansTab.clearNotificationsButton.toolTip", "\u6E05\u9664\u901A\u77E5"},
{"MBeansTab.compositeNavigationMultiple", "\u7EC4\u5408\u5BFC\u822A{0}/{1}"},
{"MBeansTab.compositeNavigationSingle", "\u7EC4\u5408\u5BFC\u822A"},
- {"MBeansTab.refreshAttributesButton", "\u5237\u65B0"},
+ {"MBeansTab.refreshAttributesButton", "\u5237\u65B0(R)"},
{"MBeansTab.refreshAttributesButton.mnemonic", "R"},
{"MBeansTab.refreshAttributesButton.toolTip", "\u5237\u65B0\u5C5E\u6027"},
- {"MBeansTab.subscribeNotificationsButton", "\u8BA2\u9605"},
+ {"MBeansTab.subscribeNotificationsButton", "\u8BA2\u9605(S)"},
{"MBeansTab.subscribeNotificationsButton.mnemonic", "S"},
{"MBeansTab.subscribeNotificationsButton.toolTip", "\u5F00\u59CB\u76D1\u542C\u901A\u77E5"},
{"MBeansTab.tabularNavigationMultiple", "\u8868\u683C\u5F0F\u5BFC\u822A{0}/{1}"},
{"MBeansTab.tabularNavigationSingle", "\u8868\u683C\u5F0F\u5BFC\u822A"},
- {"MBeansTab.unsubscribeNotificationsButton", "\u53D6\u6D88\u8BA2\u9605"},
+ {"MBeansTab.unsubscribeNotificationsButton", "\u53D6\u6D88\u8BA2\u9605(U)"},
{"MBeansTab.unsubscribeNotificationsButton.mnemonic", "U"},
{"MBeansTab.unsubscribeNotificationsButton.toolTip", "\u505C\u6B62\u76D1\u542C\u901A\u77E5"},
{"Manage Hotspot MBeans in: ", "\u7BA1\u7406\u4EE5\u4E0B\u4F4D\u7F6E\u7684\u70ED\u70B9 MBean: "},
@@ -262,7 +262,7 @@
{"MemoryTab.poolPlotter.accessibleName", "{0}\u7684\u5185\u5B58\u4F7F\u7528\u91CF\u56FE\u8868\u3002"},
{"Message","\u6D88\u606F"},
{"Method successfully invoked", "\u5DF2\u6210\u529F\u8C03\u7528\u65B9\u6CD5"},
- {"Minimize All", "\u5168\u90E8\u6700\u5C0F\u5316"},
+ {"Minimize All", "\u5168\u90E8\u6700\u5C0F\u5316(M)"},
{"Minimize All.mnemonic", "M"},
{"Minus Version", "\u8FD9\u662F{0}\u7248\u672C {1}"},
{"Monitor locked",
@@ -278,7 +278,7 @@
"\u540D\u79F0: {0}\n\u72B6\u6001: {2}\u4E0A\u7684{1}\n"},
{"Name State LockName LockOwner",
"\u540D\u79F0: {0}\n\u72B6\u6001: {2}\u4E0A\u7684{1}, \u62E5\u6709\u8005: {3}\n"},
- {"New Connection...", "\u65B0\u5EFA\u8FDE\u63A5..."},
+ {"New Connection...", "\u65B0\u5EFA\u8FDE\u63A5(N)..."},
{"New Connection....mnemonic", "N"},
{"New value applied","\u5DF2\u5E94\u7528\u65B0\u503C"},
{"No attribute selected","\u672A\u9009\u62E9\u5C5E\u6027"},
@@ -304,19 +304,19 @@
{"Overview","\u6982\u89C8"},
{"OverviewPanel.plotter.accessibleName", "{0}\u7684\u56FE\u8868\u3002"},
{"Parameter", "\u53C2\u6570"},
- {"Password: ", "\u53E3\u4EE4: "},
+ {"Password: ", "\u53E3\u4EE4(P): "},
{"Password: .mnemonic", "P"},
{"Password.accessibleName", "\u53E3\u4EE4"},
{"Peak","\u5CF0\u503C"},
- {"Perform GC", "\u6267\u884C GC"},
+ {"Perform GC", "\u6267\u884C GC(G)"},
{"Perform GC.mnemonic", "G"},
{"Perform GC.toolTip", "\u8BF7\u6C42\u5783\u573E\u6536\u96C6"},
{"Plotter.accessibleName", "\u56FE\u8868"},
{"Plotter.accessibleName.keyAndValue", "{0}={1}\n"},
{"Plotter.accessibleName.noData", "\u672A\u7ED8\u5236\u6570\u636E\u3002"},
- {"Plotter.saveAsMenuItem", "\u5C06\u6570\u636E\u53E6\u5B58\u4E3A..."},
+ {"Plotter.saveAsMenuItem", "\u5C06\u6570\u636E\u53E6\u5B58\u4E3A(A)..."},
{"Plotter.saveAsMenuItem.mnemonic", "A"},
- {"Plotter.timeRangeMenu", "\u65F6\u95F4\u8303\u56F4"},
+ {"Plotter.timeRangeMenu", "\u65F6\u95F4\u8303\u56F4(T)"},
{"Plotter.timeRangeMenu.mnemonic", "T"},
{"Problem adding listener","\u6DFB\u52A0\u76D1\u542C\u7A0B\u5E8F\u65F6\u51FA\u73B0\u95EE\u9898"},
{"Problem displaying MBean", "\u663E\u793A MBean \u65F6\u51FA\u73B0\u95EE\u9898"},
@@ -328,11 +328,11 @@
{"Readable","\u53EF\u8BFB"},
{"Received","\u6536\u5230"},
{"Reconnect","\u91CD\u65B0\u8FDE\u63A5"},
- {"Remote Process:", "\u8FDC\u7A0B\u8FDB\u7A0B:"},
+ {"Remote Process:", "\u8FDC\u7A0B\u8FDB\u7A0B(R):"},
{"Remote Process:.mnemonic", "R"},
{"Remote Process.textField.accessibleName", "\u8FDC\u7A0B\u8FDB\u7A0B"},
{"Remove","\u5220\u9664"},
- {"Restore All", "\u5168\u90E8\u8FD8\u539F"},
+ {"Restore All", "\u5168\u90E8\u8FD8\u539F(R)"},
{"Restore All.mnemonic", "R"},
{"Return value", "\u8FD4\u56DE\u503C"},
{"ReturnType", "ReturnType"},
@@ -363,9 +363,9 @@
{"ThreadTab.threadInfo.accessibleName", "\u7EBF\u7A0B\u4FE1\u606F"},
{"ThreadTab.threadPlotter.accessibleName", "\u8868\u793A\u7EBF\u7A0B\u6570\u7684\u56FE\u8868\u3002"},
{"Threshold","\u9608\u503C"},
- {"Tile", "\u5E73\u94FA"},
+ {"Tile", "\u5E73\u94FA(T)"},
{"Tile.mnemonic", "T"},
- {"Time Range:", "\u65F6\u95F4\u8303\u56F4:"},
+ {"Time Range:", "\u65F6\u95F4\u8303\u56F4(T):"},
{"Time Range:.mnemonic", "T"},
{"Time", "\u65F6\u95F4"},
{"TimeStamp","TimeStamp"},
@@ -386,7 +386,7 @@
{"Usage Threshold","\u7528\u6CD5\u9608\u503C"},
{"remoteTF.usage","<b>\u7528\u6CD5</b>: <hostname>:<port> \u6216 service:jmx:<protocol>:<sap>"},
{"Used","\u5DF2\u7528"},
- {"Username: ", "\u7528\u6237\u540D: "},
+ {"Username: ", "\u7528\u6237\u540D(U): "},
{"Username: .mnemonic", "U"},
{"Username.accessibleName", "\u7528\u6237\u540D"},
{"UserData","UserData"},
@@ -400,7 +400,7 @@
{"Verbose Output.toolTip", "\u4E3A\u7C7B\u52A0\u8F7D\u7CFB\u7EDF\u542F\u7528\u8BE6\u7EC6\u8F93\u51FA"},
{"View value", "\u89C6\u56FE\u503C"},
{"View","\u89C6\u56FE"},
- {"Window", "\u7A97\u53E3"},
+ {"Window", "\u7A97\u53E3(W)"},
{"Window.mnemonic", "W"},
{"Windows","Windows"},
{"Writable","\u53EF\u5199"},
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_de.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_de.properties Mon Apr 11 16:19:20 2011 -0700
@@ -25,13 +25,22 @@
# Localizations for Level names. For the US locale
# these are the same as the non-localized level name.
+
+# The following ALL CAPS words should be translated.
ALL=ALL
+# The following ALL CAPS words should be translated.
SEVERE=SEVERE
+# The following ALL CAPS words should be translated.
WARNING=WARNING
+# The following ALL CAPS words should be translated.
INFO=INFO
+# The following ALL CAPS words should be translated.
CONFIG= CONFIG
+# The following ALL CAPS words should be translated.
FINE=FINE
+# The following ALL CAPS words should be translated.
FINER=FINER
+# The following ALL CAPS words should be translated.
FINEST=FINEST
+# The following ALL CAPS words should be translated.
OFF=OFF
-
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_es.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_es.properties Mon Apr 11 16:19:20 2011 -0700
@@ -25,13 +25,22 @@
# Localizations for Level names. For the US locale
# these are the same as the non-localized level name.
+
+# The following ALL CAPS words should be translated.
ALL=ALL
+# The following ALL CAPS words should be translated.
SEVERE=SEVERE
+# The following ALL CAPS words should be translated.
WARNING=WARNING
+# The following ALL CAPS words should be translated.
INFO=INFO
+# The following ALL CAPS words should be translated.
CONFIG= CONFIG
+# The following ALL CAPS words should be translated.
FINE=FINE
+# The following ALL CAPS words should be translated.
FINER=FINER
+# The following ALL CAPS words should be translated.
FINEST=FINEST
+# The following ALL CAPS words should be translated.
OFF=OFF
-
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_fr.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_fr.properties Mon Apr 11 16:19:20 2011 -0700
@@ -25,13 +25,22 @@
# Localizations for Level names. For the US locale
# these are the same as the non-localized level name.
+
+# The following ALL CAPS words should be translated.
ALL=ALL
+# The following ALL CAPS words should be translated.
SEVERE=SEVERE
+# The following ALL CAPS words should be translated.
WARNING=WARNING
+# The following ALL CAPS words should be translated.
INFO=INFO
+# The following ALL CAPS words should be translated.
CONFIG= CONFIG
+# The following ALL CAPS words should be translated.
FINE=FINE
+# The following ALL CAPS words should be translated.
FINER=FINER
+# The following ALL CAPS words should be translated.
FINEST=FINEST
+# The following ALL CAPS words should be translated.
OFF=OFF
-
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_it.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_it.properties Mon Apr 11 16:19:20 2011 -0700
@@ -25,13 +25,22 @@
# Localizations for Level names. For the US locale
# these are the same as the non-localized level name.
+
+# The following ALL CAPS words should be translated.
ALL=ALL
+# The following ALL CAPS words should be translated.
SEVERE=SEVERE
+# The following ALL CAPS words should be translated.
WARNING=WARNING
+# The following ALL CAPS words should be translated.
INFO=INFO
+# The following ALL CAPS words should be translated.
CONFIG= CONFIG
+# The following ALL CAPS words should be translated.
FINE=FINE
+# The following ALL CAPS words should be translated.
FINER=FINER
+# The following ALL CAPS words should be translated.
FINEST=FINEST
+# The following ALL CAPS words should be translated.
OFF=OFF
-
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_ja.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_ja.properties Mon Apr 11 16:19:20 2011 -0700
@@ -25,13 +25,22 @@
# Localizations for Level names. For the US locale
# these are the same as the non-localized level name.
+
+# The following ALL CAPS words should be translated.
ALL=\u3059\u3079\u3066
+# The following ALL CAPS words should be translated.
SEVERE=SEVERE
+# The following ALL CAPS words should be translated.
WARNING=WARNING
+# The following ALL CAPS words should be translated.
INFO=\u60C5\u5831
+# The following ALL CAPS words should be translated.
CONFIG= CONFIG
+# The following ALL CAPS words should be translated.
FINE=\u8A73\u7D30\u30EC\u30D9\u30EB(\u4F4E)
+# The following ALL CAPS words should be translated.
FINER=FINER
+# The following ALL CAPS words should be translated.
FINEST=FINEST
+# The following ALL CAPS words should be translated.
OFF=\u30AA\u30D5
-
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_ko.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_ko.properties Mon Apr 11 16:19:20 2011 -0700
@@ -25,13 +25,22 @@
# Localizations for Level names. For the US locale
# these are the same as the non-localized level name.
+
+# The following ALL CAPS words should be translated.
ALL=ALL
+# The following ALL CAPS words should be translated.
SEVERE=SEVERE
+# The following ALL CAPS words should be translated.
WARNING=WARNING
+# The following ALL CAPS words should be translated.
INFO=INFO
+# The following ALL CAPS words should be translated.
CONFIG= CONFIG
+# The following ALL CAPS words should be translated.
FINE=FINE
+# The following ALL CAPS words should be translated.
FINER=FINER
+# The following ALL CAPS words should be translated.
FINEST=FINEST
+# The following ALL CAPS words should be translated.
OFF=OFF
-
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_pt_BR.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_pt_BR.properties Mon Apr 11 16:19:20 2011 -0700
@@ -25,13 +25,22 @@
# Localizations for Level names. For the US locale
# these are the same as the non-localized level name.
-ALL=TUDO
+
+# The following ALL CAPS words should be translated.
+ALL=ALL
+# The following ALL CAPS words should be translated.
SEVERE=SEVERE
+# The following ALL CAPS words should be translated.
WARNING=WARNING
+# The following ALL CAPS words should be translated.
INFO=INFO
+# The following ALL CAPS words should be translated.
CONFIG= CONFIG
+# The following ALL CAPS words should be translated.
FINE=FINE
+# The following ALL CAPS words should be translated.
FINER=FINER
+# The following ALL CAPS words should be translated.
FINEST=FINEST
+# The following ALL CAPS words should be translated.
OFF=OFF
-
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_sv.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_sv.properties Mon Apr 11 16:19:20 2011 -0700
@@ -25,13 +25,22 @@
# Localizations for Level names. For the US locale
# these are the same as the non-localized level name.
-ALL=ALLA
+
+# The following ALL CAPS words should be translated.
+ALL=ALL
+# The following ALL CAPS words should be translated.
SEVERE=SEVERE
+# The following ALL CAPS words should be translated.
WARNING=WARNING
+# The following ALL CAPS words should be translated.
INFO=INFO
+# The following ALL CAPS words should be translated.
CONFIG= CONFIG
-FINE=FIN
+# The following ALL CAPS words should be translated.
+FINE=FINE
+# The following ALL CAPS words should be translated.
FINER=FINER
+# The following ALL CAPS words should be translated.
FINEST=FINEST
-OFF=AV
-
+# The following ALL CAPS words should be translated.
+OFF=OFF
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_zh_CN.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_zh_CN.properties Mon Apr 11 16:19:20 2011 -0700
@@ -25,13 +25,22 @@
# Localizations for Level names. For the US locale
# these are the same as the non-localized level name.
+
+# The following ALL CAPS words should be translated.
ALL=ALL
+# The following ALL CAPS words should be translated.
SEVERE=SEVERE
+# The following ALL CAPS words should be translated.
WARNING=WARNING
+# The following ALL CAPS words should be translated.
INFO=INFO
+# The following ALL CAPS words should be translated.
CONFIG= CONFIG
+# The following ALL CAPS words should be translated.
FINE=FINE
+# The following ALL CAPS words should be translated.
FINER=FINER
+# The following ALL CAPS words should be translated.
FINEST=FINEST
+# The following ALL CAPS words should be translated.
OFF=OFF
-
--- a/jdk/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties Mon Apr 11 16:19:20 2011 -0700
@@ -25,13 +25,22 @@
# Localizations for Level names. For the US locale
# these are the same as the non-localized level name.
+
+# The following ALL CAPS words should be translated.
ALL=\u6240\u6709
+# The following ALL CAPS words should be translated.
SEVERE=SEVERE
+# The following ALL CAPS words should be translated.
WARNING=WARNING
+# The following ALL CAPS words should be translated.
INFO=\u8CC7\u8A0A
+# The following ALL CAPS words should be translated.
CONFIG= CONFIG
+# The following ALL CAPS words should be translated.
FINE=\u7D30\u7DFB
+# The following ALL CAPS words should be translated.
FINER=FINER
+# The following ALL CAPS words should be translated.
FINEST=FINEST
+# The following ALL CAPS words should be translated.
OFF=\u95DC\u9589
-
--- a/jdk/src/share/classes/sun/util/resources/CurrencyNames_de.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/util/resources/CurrencyNames_de.properties Mon Apr 11 16:19:20 2011 -0700
@@ -1,49 +1,70 @@
#
-# Copyright (c) 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
#
#
# COPYRIGHT AND PERMISSION NOTICE
#
-# Copyright (C) 1991-2007 Unicode, Inc. All rights reserved.
+# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved.
# Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of the Unicode data files and any associated documentation (the "Data
-# Files") or Unicode software and any associated documentation (the
-# "Software") to deal in the Data Files or Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, and/or sell copies of the Data Files or Software, and
-# to permit persons to whom the Data Files or Software are furnished to do
-# so, provided that (a) the above copyright notice(s) and this permission
-# notice appear with all copies of the Data Files or Software, (b) both the
-# above copyright notice(s) and this permission notice appear in associated
-# documentation, and (c) there is clear notice in each modified Data File or
-# in the Software as well as in the documentation associated with the Data
-# File(s) or Software that the data or software has been modified.
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of the Unicode data files and any associated documentation (the
+# "Data Files") or Unicode software and any associated documentation
+# (the "Software") to deal in the Data Files or Software without
+# restriction, including without limitation the rights to use, copy,
+# modify, merge, publish, distribute, and/or sell copies of the Data
+# Files or Software, and to permit persons to whom the Data Files or
+# Software are furnished to do so, provided that (a) the above copyright
+# notice(s) and this permission notice appear with all copies of the
+# Data Files or Software, (b) both the above copyright notice(s) and
+# this permission notice appear in associated documentation, and (c)
+# there is clear notice in each modified Data File or in the Software as
+# well as in the documentation associated with the Data File(s) or
+# Software that the data or software has been modified.
#
-# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
-# THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
-# INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
-# CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-# USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+# ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR
+# ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR
+# SOFTWARE.
#
-# Except as contained in this notice, the name of a copyright holder shall not
-# be used in advertising or otherwise to promote the sale, use or other
-# dealings in these Data Files or Software without prior written
-# authorization of the copyright holder.
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in these Data Files or Software without prior
+# written authorization of the copyright holder.
+
#
-
# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
-
+#
adp=Andorranische Pesete
aed=UAE Dirham
-afa=Afghani (1927-2002)
-afn=Afghani
all=Lek
amd=Dram
ang=Niederl. Antillen Gulden
@@ -52,7 +73,8 @@
ats=\u00d6sterreichischer Schilling
aud=Australischer Dollar
awg=Aruba Florin
-azm=Aserbeidschan Manat
+azm=Aserbaidschan-Manat (1993-2006)
+azn=Aserbaidschan-Manat
bam=Konvertierbare Mark
bbd=Barbados-Dollar
bdt=Taka
@@ -63,7 +85,6 @@
bif=Burundi-Franc
bmd=Bermuda-Dollar
bnd=Brunei-Dollar
-bob=Boliviano
bov=Mvdol
brl=Real
bsd=Bahama-Dollar
@@ -80,11 +101,11 @@
cny=Renminbi Yuan
cop=Kolumbianischer Peso
crc=Costa Rica Colon
+csd=Alter Serbischer Dinar
cup=Kubanischer Peso
cve=Kap Verde Escudo
-cyp=Zypern Pfund
+cyp=Zypern-Pfund
czk=Tschechische Krone
-dem=Deutsche Mark
djf=Dschibuti-Franc
dkk=D\u00e4nische Krone
dop=Dominikanischer Peso
@@ -92,24 +113,24 @@
eek=Estnische Krone
egp=\u00c4gyptisches Pfund
ern=Nakfa
-esp=Spanische Pesete
+esp=Spanische Peseta
etb=Birr
-eur=Euro
fim=Finnische Mark
-fjd=Fidschi Dollar
-fkp=Falkland Pfund
+fjd=Fidschi-Dollar
+fkp=Falkland-Pfund
frf=Franz\u00f6sischer Franc
gbp=Pfund Sterling
gel=Georgischer Lari
ghc=Cedi
-gip=Gibraltar Pfund
+ghs=Ghanaische Cedi
+gip=Gibraltar-Pfund
gmd=Dalasi
-gnf=Guinea Franc
+gnf=Guinea-Franc
grd=Griechische Drachme
gtq=Quetzal
gwp=Guinea Bissau Peso
-gyd=Guyana Dollar
-hkd=Hongkong Dollar
+gyd=Guyana-Dollar
+hkd=Hongkong-Dollar
hnl=Lempira
hrk=Kuna
htg=Gourde
@@ -121,11 +142,11 @@
iqd=Irak Dinar
irr=Rial
isk=Isl\u00e4ndische Krone
-itl=Italienische Lire
-jmd=Jamaika Dollar
+itl=Italienische Lira
+jmd=Jamaika-Dollar
jod=Jordanischer Dinar
jpy=Yen
-kes=Kenia Schilling
+kes=Kenia-Schilling
kgs=Som
khr=Riel
kmf=Komoren Franc
@@ -146,27 +167,26 @@
mad=Marokkanischer Dirham
mdl=Moldau Leu
mga=Madagaskar Ariary
-mgf=Madagaskar Franc
+mgf=Madagaskar-Franc
mkd=Denar
mmk=Kyat
mnt=Tugrik
mop=Pataca
mro=Ouguiya
mtl=Maltesische Lira
-mur=Mauritius Rupie
+mur=Mauritius-Rupie
mvr=Rufiyaa
-mwk=Malawi Kwacha
mxn=Mexikanischer Peso
-mxv=Mexican Unidad de Inversion (UDI)
myr=Malaysischer Ringgit
-mzm=Metical
-nad=Namibia Dollar
+mzm=Alter Metical
+mzn=Metical
+nad=Namibia-Dollar
ngn=Naira
nio=Gold-Cordoba
nlg=Holl\u00e4ndischer Gulden
nok=Norwegische Krone
npr=Nepalesische Rupie
-nzd=Neuseeland Dollar
+nzd=Neuseeland-Dollar
omr=Rial Omani
pab=Balboa
pen=Neuer Sol
@@ -178,23 +198,25 @@
pyg=Guarani
qar=Katar Riyal
rol=Leu
+ron=Rum\u00e4nischer Leu
+rsd=Serbischer Dinar
rub=Russischer Rubel (neu)
rur=Russischer Rubel (alt)
-rwf=Ruanda Franc
-sar=Saudi Riyal
-sbd=Salomonen Dollar
-scr=Seychellen Rupie
+rwf=Ruanda-Franc
+sbd=Salomonen-Dollar
+scr=Seychellen-Rupie
sdd=Sudanesischer Dinar
+sdg=Sudanesisches Pfund
sek=Schwedische Krone
-sgd=Singapur Dollar
+sgd=Singapur-Dollar
shp=St. Helena Pfund
sit=Tolar
skk=Slowakische Krone
sll=Leone
-sos=Somalia Schilling
+sos=Somalia-Schilling
+srd=Surinamischer Dollar
srg=Suriname Gulden
std=Dobra
-svc=El Salvador Colon
syp=Syrisches Pfund
szl=Lilangeni
thb=Baht
@@ -202,26 +224,29 @@
tmm=Turkmenistan-Manat
tnd=Tunesischer Dinar
top=Pa\u02bbanga
-tpe=Timor Escudo
-trl=T\u00fcrkische Lira
-try=Neue T\u00fcrkische Lira
-ttd=Trinidad und Tobago Dollar
-twd=Neuer Taiwan Dollar
-tzs=Tansania Schilling
+tpe=Timor-Escudo
+trl=Alte T\u00fcrkische Lira
+try=T\u00fcrkische Lira
+ttd=Trinidad- und Tobago-Dollar
+twd=Neuer Taiwan-Dollar
+tzs=Tansania-Schilling
uah=Hryvnia
-ugx=Uganda Schilling
-usd=US Dollar
+ugx=Uganda-Schilling
+usd=US-Dollar
usn=US Dollar (N\u00e4chster Tag)
uss=US Dollar (Gleicher Tag)
uyu=Uruguayischer Peso
uzs=Usbekistan Sum
veb=Bolivar
+vef=Bol\u00edvar Fuerte
vnd=Dong
vuv=Vatu
wst=Tala
xaf=CFA Franc (\u00c4quatorial)
-xau=Gold
+xag=Unze Silber
+xau=Unze Gold
xba=Europ\u00e4ische Rechnungseinheit
+xbb=Europ\u00e4ische W\u00e4hrungseinheit (XBB)
xbc=Europ\u00e4ische Rechnungseinheit (XBC)
xbd=Europ\u00e4ische Rechnungseinheit (XBD)
xcd=Ostkaribischer Dollar
@@ -229,9 +254,12 @@
xfo=Franz\u00f6sischer Gold-Franc
xfu=Franz\u00f6sischer UIC-Franc
xof=CFA Franc (West)
-xpf=CFP Franc
-yer=Jemen Rial
+xpd=Unze Palladium
+xpt=Unze Platin
+xts=Testw\u00e4hrung
+xxx=Unbekannte W\u00e4hrung
+yer=Jemen-Rial
yum=Neuer Dinar
-zar=Rand
+zar=S\u00fcdafrikanischer Rand
zmk=Kwacha
-zwd=Simbabwe Dollar
+zwd=Simbabwe-Dollar
--- a/jdk/src/share/classes/sun/util/resources/CurrencyNames_es.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/util/resources/CurrencyNames_es.properties Mon Apr 11 16:19:20 2011 -0700
@@ -1,47 +1,70 @@
#
-# Copyright (c) 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
#
#
# COPYRIGHT AND PERMISSION NOTICE
#
-# Copyright (C) 1991-2007 Unicode, Inc. All rights reserved.
+# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved.
# Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of the Unicode data files and any associated documentation (the "Data
-# Files") or Unicode software and any associated documentation (the
-# "Software") to deal in the Data Files or Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, and/or sell copies of the Data Files or Software, and
-# to permit persons to whom the Data Files or Software are furnished to do
-# so, provided that (a) the above copyright notice(s) and this permission
-# notice appear with all copies of the Data Files or Software, (b) both the
-# above copyright notice(s) and this permission notice appear in associated
-# documentation, and (c) there is clear notice in each modified Data File or
-# in the Software as well as in the documentation associated with the Data
-# File(s) or Software that the data or software has been modified.
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of the Unicode data files and any associated documentation (the
+# "Data Files") or Unicode software and any associated documentation
+# (the "Software") to deal in the Data Files or Software without
+# restriction, including without limitation the rights to use, copy,
+# modify, merge, publish, distribute, and/or sell copies of the Data
+# Files or Software, and to permit persons to whom the Data Files or
+# Software are furnished to do so, provided that (a) the above copyright
+# notice(s) and this permission notice appear with all copies of the
+# Data Files or Software, (b) both the above copyright notice(s) and
+# this permission notice appear in associated documentation, and (c)
+# there is clear notice in each modified Data File or in the Software as
+# well as in the documentation associated with the Data File(s) or
+# Software that the data or software has been modified.
#
-# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
-# THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
-# INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
-# CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-# USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+# ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR
+# ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR
+# SOFTWARE.
#
-# Except as contained in this notice, the name of a copyright holder shall not
-# be used in advertising or otherwise to promote the sale, use or other
-# dealings in these Data Files or Software without prior written
-# authorization of the copyright holder.
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in these Data Files or Software without prior
+# written authorization of the copyright holder.
+
#
-
# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
-
+#
adp=peseta andorrana
-aed=dirham de los Emiratos \u00c1rabes Unidos
+aed=d\u00edrham de los Emiratos \u00c1rabes Unidos
afa=afgani (1927-2002)
afn=afgani
all=lek alban\u00e9s
@@ -52,7 +75,8 @@
ats=chel\u00edn austriaco
aud=d\u00f3lar australiano
awg=flor\u00edn de Aruba
-azm=manat azer\u00ed
+azm=manat azer\u00ed (1993-2006)
+azn=manat azer\u00ed
bam=marco convertible de Bosnia-Herzegovina
bbd=d\u00f3lar de Barbados
bdt=taka de Bangladesh
@@ -80,7 +104,7 @@
cny=yuan renminbi chino
cop=peso colombiano
crc=col\u00f3n costarricense
-csd=dinar serbio
+csd=antiguo dinar serbio
cup=peso cubano
cve=escudo de Cabo Verde
cyp=libra chipriota
@@ -102,7 +126,8 @@
frf=franco franc\u00e9s
gbp=libra esterlina brit\u00e1nica
gel=lari georgiano
-ghc=cedi ghan\u00e9s
+ghc=cedi ghan\u00e9s (1979-2007)
+ghs=cedi ghan\u00e9s
gip=libra de Gibraltar
gmd=dalasi gambiano
gnf=franco guineano
@@ -160,7 +185,8 @@
mxn=peso mexicano
mxv=unidad de inversi\u00f3n (UDI) mexicana
myr=ringgit malasio
-mzm=metical mozambique\u00f1o
+mzm=antiguo metical mozambique\u00f1o
+mzn=metical mozambique\u00f1o
nad=d\u00f3lar de Namibia
ngn=naira nigeriano
nio=c\u00f3rdoba oro nicarag\u00fcense
@@ -180,6 +206,7 @@
qar=riyal de Qatar
rol=antiguo leu rumano
ron=leu rumano
+rsd=dinar serbio
rub=rublo ruso
rur=rublo ruso (1991-1998)
rwf=franco ruand\u00e9s
@@ -187,6 +214,7 @@
sbd=d\u00f3lar de las Islas Salom\u00f3n
scr=rupia de Seychelles
sdd=dinar sudan\u00e9s
+sdg=libra sudanesa
sek=corona sueca
sgd=d\u00f3lar singapurense
shp=libra de Santa Elena
@@ -206,7 +234,7 @@
tnd=dinar tunecino
top=pa\u02bbanga tongano
tpe=escudo timorense
-trl=lira turca
+trl=lira turca antigua
try=nueva lira turca
ttd=d\u00f3lar de Trinidad y Tobago
twd=nuevo d\u00f3lar taiwan\u00e9s
@@ -219,6 +247,7 @@
uyu=peso uruguayo
uzs=sum uzbeko
veb=bol\u00edvar venezolano
+vef=bol\u00edvar fuerte venezolano
vnd=dong vietnamita
vuv=vatu vanuatuense
wst=tala samoano
--- a/jdk/src/share/classes/sun/util/resources/CurrencyNames_fr.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/util/resources/CurrencyNames_fr.properties Mon Apr 11 16:19:20 2011 -0700
@@ -1,224 +1,256 @@
#
-# Copyright (c) 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
#
#
# COPYRIGHT AND PERMISSION NOTICE
#
-# Copyright (C) 1991-2007 Unicode, Inc. All rights reserved.
+# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved.
# Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of the Unicode data files and any associated documentation (the "Data
-# Files") or Unicode software and any associated documentation (the
-# "Software") to deal in the Data Files or Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, and/or sell copies of the Data Files or Software, and
-# to permit persons to whom the Data Files or Software are furnished to do
-# so, provided that (a) the above copyright notice(s) and this permission
-# notice appear with all copies of the Data Files or Software, (b) both the
-# above copyright notice(s) and this permission notice appear in associated
-# documentation, and (c) there is clear notice in each modified Data File or
-# in the Software as well as in the documentation associated with the Data
-# File(s) or Software that the data or software has been modified.
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of the Unicode data files and any associated documentation (the
+# "Data Files") or Unicode software and any associated documentation
+# (the "Software") to deal in the Data Files or Software without
+# restriction, including without limitation the rights to use, copy,
+# modify, merge, publish, distribute, and/or sell copies of the Data
+# Files or Software, and to permit persons to whom the Data Files or
+# Software are furnished to do so, provided that (a) the above copyright
+# notice(s) and this permission notice appear with all copies of the
+# Data Files or Software, (b) both the above copyright notice(s) and
+# this permission notice appear in associated documentation, and (c)
+# there is clear notice in each modified Data File or in the Software as
+# well as in the documentation associated with the Data File(s) or
+# Software that the data or software has been modified.
#
-# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
-# THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
-# INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
-# CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-# USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+# ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR
+# ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR
+# SOFTWARE.
#
-# Except as contained in this notice, the name of a copyright holder shall not
-# be used in advertising or otherwise to promote the sale, use or other
-# dealings in these Data Files or Software without prior written
-# authorization of the copyright holder.
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in these Data Files or Software without prior
+# written authorization of the copyright holder.
+
#
-
# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
-
+#
adp=peseta andorrane
aed=dirham des \u00c9mirats arabes unis
-afa=afghani [AFA]
+afa=afghani (1927\u20132002)
afn=afghani
-all=lek
+all=lek albanais
amd=dram arm\u00e9nien
-ang=florin des Antilles
+ang=florin antillais
aoa=kwanza angolais
ars=peso argentin
ats=schilling autrichien
aud=dollar australien
-awg=florin d\u2019Aruba
-azm=manat az\u00e9ri
-bam=mark bosniaque convertible
-bbd=dollar de Barbade
-bdt=taka
+awg=florin arubais
+azm=manat az\u00e9ri (1993-2006)
+azn=manat az\u00e9ri
+bam=mark convertible bosniaque
+bbd=dollar barbadien
+bdt=taka bangladeshi
bef=franc belge
-bgl=lev
-bgn=nouveau lev
-bhd=dinar de Bahre\u00efn
-bif=franc du Burundi
-bmd=dollar des Bermudes
-bnd=dollar de Brunei
+bgl=lev bulgare (1962\u20131999)
+bgn=nouveau lev bulgare
+bhd=dinar bahre\u00efni
+bif=franc burundais
+bmd=dollar bermudien
+bnd=dollar brun\u00e9ien
bob=boliviano
-bov=mvdol
-brl=r\u00e9al
-bsd=dollar des Bahamas
-btn=ngultrum
-bwp=pula
+bov=mvdol bolivien
+brl=r\u00e9al br\u00e9silien
+bsd=dollar baham\u00e9en
+btn=ngultrum bouthanais
+bwp=pula botswanais
byb=nouveau rouble bi\u00e9lorusse (1994-1999)
byr=rouble bi\u00e9lorusse
-bzd=dollar de Belize
+bzd=dollar b\u00e9liz\u00e9en
cad=dollar canadien
cdf=franc congolais
chf=franc suisse
clf=unit\u00e9 d\u2019investissement chilienne
clp=peso chilien
-cny=Yuan Ren-min-bi
+cny=yuan renminbi chinois
cop=peso colombien
-crc=colon de Costa Rica
-csd=dinar serbe
+crc=col\u00f3n costaricain
+csd=dinar serbo-mont\u00e9n\u00e9grin
cup=peso cubain
-cve=escudo du Cap-Vert
-cyp=livre cypriote
+cve=escudo capverdien
+cyp=livre chypriote
czk=couronne tch\u00e8que
-dem=deutsche mark
-djf=franc de Djibouti
+dem=mark allemand
+djf=franc djiboutien
dkk=couronne danoise
dop=peso dominicain
dzd=dinar alg\u00e9rien
eek=couronne estonienne
egp=livre \u00e9gyptienne
-ern=Eritrean Nakfa
+ern=nafka \u00e9rythr\u00e9en
esp=peseta espagnole
-etb=birr
+etb=birr \u00e9thiopien
eur=euro
fim=mark finlandais
-fjd=dollar de Fidji
-fkp=livre des Falkland (Malvinas)
+fjd=dollar fidjien
+fkp=livre des Falkland
frf=franc fran\u00e7ais
gbp=livre sterling
-gel=lari
+gel=lari g\u00e9orgien
ghc=c\u00e9di
+ghs=c\u00e9di ghan\u00e9en
gip=livre de Gibraltar
-gmd=dalasie
+gmd=dalasi gambien
gnf=franc guin\u00e9en
-grd=drachme
-gtq=quetzal
-gwp=peso de Guin\u00e9e-Bissau
+grd=drachme grecque
+gtq=quetzal guat\u00e9malt\u00e8que
+gwp=peso bissau-guin\u00e9en
gyd=dollar du Guyana
hkd=dollar de Hong Kong
-hnl=lempira
-hrk=kuna
-htg=gourde
-huf=forint
-idr=rupiah
+hnl=lempira hondurien
+hrk=kuna croate
+htg=gourde ha\u00eftienne
+huf=forint hongrois
+idr=roupie indon\u00e9sienne
iep=livre irlandaise
+ils=nouveau shekel isra\u00e9lien
inr=roupie indienne
+iqd=dinar irakien
irr=rial iranien
isk=couronne islandaise
itl=lire italienne
jmd=dollar jama\u00efcain
jod=dinar jordanien
-jpy=yen
-kes=shilling du Kenya
-kgs=som
-khr=riel
-kmf=franc des Comores
+jpy=yen japonais
+kes=shilling k\u00e9nyan
+kgs=som kirghize
+khr=riel cambodgien
+kmf=franc comorien
kpw=won nord-cor\u00e9en
krw=won sud-cor\u00e9en
+kwd=dinar kowe\u00eftien
kyd=dollar des \u00eeles Ca\u00efmanes
-kzt=tenge du Kazakhstan
-lak=kip
+kzt=tenge kazakh
+lak=kip loatien
lbp=livre libanaise
-lkr=roupie de Sri Lanka
+lkr=roupie srilankaise
lrd=dollar lib\u00e9rien
-lsl=loti
+lsl=loti lesothan
ltl=litas lituanien
luf=franc luxembourgeois
lvl=lats letton
lyd=dinar lybien
mad=dirham marocain
mdl=leu moldave
-mga=ariary
+mga=ariary malgache
mgf=franc malgache
-mkd=denar
-mmk=Myanmar Kyat
-mnt=tugrik
-mop=pataca
-mro=ouguija
+mkd=denar mac\u00e9donien
+mmk=kyat myanmarais
+mnt=tugrik mongol
+mop=pataca macanaise
+mro=ouguiya mauritanien
mtl=lire maltaise
mur=roupie mauricienne
-mvr=roupie des Maldives
-mwk=kwacha [MWK]
+mvr=rufiyaa maldivienne
+mwk=kwacha malawite
mxn=peso mexicain
mxv=unit\u00e9 de conversion mexicaine (UDI)
-myr=ringgit
+myr=ringgit malais
mzm=m\u00e9tical
+mzn=metical mozambicain
nad=dollar namibien
-ngn=naira
-nio=cordoba d\u2019or
+ngn=naira nig\u00e9rian
+nio=c\u00f3rdoba oro nicaraguayen
nlg=florin n\u00e9erlandais
nok=couronne norv\u00e9gienne
-npr=roupie du N\u00e9pal
+npr=roupie n\u00e9palaise
nzd=dollar n\u00e9o-z\u00e9landais
omr=rial omani
-pab=balboa
+pab=balboa panam\u00e9en
pen=nouveau sol p\u00e9ruvien
-pgk=kina
+pgk=kina papouan-n\u00e9o-guin\u00e9en
php=peso philippin
-pkr=roupie du Pakistan
-pln=zloty
+pkr=roupie pakistanaise
+pln=zloty polonais
pte=escudo portugais
-pyg=guarani
-qar=rial du Qatar
+pyg=guaran\u00ed paraguayen
+qar=rial qatari
rol=ancien leu roumain
-ron=nouveau leu roumain
-rub=rouble
-rur=rouble de Russie (1991-1998)
+ron=leu roumain
+rsd=dinar serbe
+rub=rouble russe
+rur=rouble russe (1991\u20131998)
rwf=franc rwandais
sar=rial saoudien
-sbd=dollar des \u00celes Salomon
+sbd=dollar des \u00eeles Salomon
scr=roupie des Seychelles
sdd=dinar soudanais
+sdg=livre soudanaise
sek=couronne su\u00e9doise
sgd=dollar de Singapour
shp=livre de Sainte-H\u00e9l\u00e8ne
-sit=tolar
+sit=tolar slov\u00e8ne
skk=couronne slovaque
-sll=l\u00e9one
-sos=shilling de Somalie
+sll=leone sierra-l\u00e9onais
+sos=shilling somalien
srd=dollar surinamais
-srg=florin du Surinam
-std=dobra
-svc=colon salvadorien
+srg=florin surinamais
+std=dobra santom\u00e9en
+svc=col\u00f3n salvadorien
syp=livre syrienne
-szl=lilangeni
-thb=baht
-tjs=somoni du Tadjikistan
-tmm=Turkmenistan Manat
+szl=lilangeni swazi
+thb=baht tha\u00eflandais
+tjs=somoni tadjik
+tmm=manat turkm\u00e8ne
tnd=dinar tunisien
-top=pa\u02bbanga
-tpe=escudo de Timor
+top=pa\u2019anga tongan
+tpe=escudo timorais
trl=livre turque
try=nouvelle livre turque
-ttd=dollar de la Trinit\u00e9
-twd=dollar ta\u00efwanais
-tzs=shilling de Tanzanie
-uah=hryvnia
+ttd=dollar trinidadien
+twd=nouveau dollar ta\u00efwanais
+tzs=shilling tanzanien
+uah=hryvnia ukrainienne
ugx=shilling ougandais
usd=dollar des \u00c9tats-Unis
usn=dollar des Etats-Unis (jour suivant)
uss=dollar des Etats-Unis (jour m\u00eame)
uyu=peso uruguayen
-uzs=sum
+uzs=sum ouzbek
veb=bolivar
-vnd=dong
-vuv=vatu
-wst=tala
+vef=bolivar fuerte v\u00e9n\u00e9zu\u00e9lien
+vnd=d\u00f4ng vietnamien
+vuv=vatu vanuatuan
+wst=tala samoan
xaf=franc CFA (BEAC)
xag=argent
xau=or
@@ -234,8 +266,10 @@
xpd=palladium
xpf=franc CFP
xpt=platine
-yer=riyal du Y\u00e9men
+xts=(devise de test)
+xxx=devise inconnue ou non valide
+yer=rial y\u00e9m\u00e9nite
yum=dinar yougoslave Noviy
-zar=rand
-zmk=kwacha
-zwd=dollar du Zimbabwe
+zar=rand sud-africain
+zmk=kwacha zambien
+zwd=dollar zimbabw\u00e9en
--- a/jdk/src/share/classes/sun/util/resources/CurrencyNames_it.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/util/resources/CurrencyNames_it.properties Mon Apr 11 16:19:20 2011 -0700
@@ -1,45 +1,68 @@
#
-# Copyright (c) 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
#
#
# COPYRIGHT AND PERMISSION NOTICE
#
-# Copyright (C) 1991-2007 Unicode, Inc. All rights reserved.
+# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved.
# Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of the Unicode data files and any associated documentation (the "Data
-# Files") or Unicode software and any associated documentation (the
-# "Software") to deal in the Data Files or Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, and/or sell copies of the Data Files or Software, and
-# to permit persons to whom the Data Files or Software are furnished to do
-# so, provided that (a) the above copyright notice(s) and this permission
-# notice appear with all copies of the Data Files or Software, (b) both the
-# above copyright notice(s) and this permission notice appear in associated
-# documentation, and (c) there is clear notice in each modified Data File or
-# in the Software as well as in the documentation associated with the Data
-# File(s) or Software that the data or software has been modified.
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of the Unicode data files and any associated documentation (the
+# "Data Files") or Unicode software and any associated documentation
+# (the "Software") to deal in the Data Files or Software without
+# restriction, including without limitation the rights to use, copy,
+# modify, merge, publish, distribute, and/or sell copies of the Data
+# Files or Software, and to permit persons to whom the Data Files or
+# Software are furnished to do so, provided that (a) the above copyright
+# notice(s) and this permission notice appear with all copies of the
+# Data Files or Software, (b) both the above copyright notice(s) and
+# this permission notice appear in associated documentation, and (c)
+# there is clear notice in each modified Data File or in the Software as
+# well as in the documentation associated with the Data File(s) or
+# Software that the data or software has been modified.
#
-# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
-# THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
-# INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
-# CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-# USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+# ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR
+# ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR
+# SOFTWARE.
#
-# Except as contained in this notice, the name of a copyright holder shall not
-# be used in advertising or otherwise to promote the sale, use or other
-# dealings in these Data Files or Software without prior written
-# authorization of the copyright holder.
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in these Data Files or Software without prior
+# written authorization of the copyright holder.
+
#
-
# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
-
+#
adp=Peseta Andorrana
aed=Dirham degli Emirati Arabi Uniti
afa=Afgani (1927-2002)
@@ -52,7 +75,7 @@
ats=Scellino Austriaco
aud=Dollaro Australiano
awg=Fiorino di Aruba
-azm=Manat Azero
+azm=Manat Azero (1993-2006)
bam=Marco Conv. Bosnia-Erzegovina
bbd=Dollaro di Barbados
bdt=Taka Bangladese
@@ -63,7 +86,6 @@
bif=Franco del Burundi
bmd=Dollaro delle Bermuda
bnd=Dollaro del Brunei
-bob=Boliviano
bov=Mvdol Boliviano
brl=Real Brasiliano
bsd=Dollaro delle Bahamas
@@ -80,7 +102,6 @@
cny=Renmimbi Cinese
cop=Peso Colombiano
crc=Col\u00f3n Costaricano
-csd=Dinaro serbo
cup=Peso Cubano
cve=Escudo del Capo Verde
cyp=Sterlina Cipriota
@@ -95,7 +116,6 @@
ern=Nakfa Eritreo
esp=Peseta Spagnola
etb=Birr Etiopico
-eur=Euro
fim=Markka Finlandese
fjd=Dollaro delle Figi
fkp=Sterlina delle Falkland
@@ -103,6 +123,7 @@
gbp=Sterlina Inglese
gel=Lari Georgiano
ghc=Cedi del Ghana
+ghs=Cedi ghanese
gip=Sterlina di Gibilterra
gmd=Dalasi del Gambia
gnf=Franco della Guinea
@@ -116,7 +137,7 @@
htg=Gourde Haitiano
huf=Fiorino Ungherese
idr=Rupia Indonesiana
-iep=Lira Irlandese
+iep=Sterlina irlandese
ils=Nuovo sheqel israeliano
inr=Rupia Indiana
iqd=Dinaro Iracheno
@@ -127,7 +148,7 @@
jod=Dinaro Giordano
jpy=Yen Giapponese
kes=Scellino Keniota
-kgs=Som Kirghiso
+kgs=Som Kirghiso
khr=Riel Cambogiano
kmf=Franco Comoriano
kpw=Won Nordcoreano
@@ -160,7 +181,7 @@
mxn=Peso Messicano
mxv=Unidad de Inversion (UDI) Messicana
myr=Ringgit della Malesia
-mzm=Metical del Mozambico
+mzn=Metical del Mozambico
nad=Dollaro Namibiano
ngn=Naira Nigeriana
nio=C\u00f3rdoba oro nicaraguense
@@ -179,6 +200,7 @@
pyg=Guarani del Paraguay
qar=Rial del Qatar
rol=Leu della Romania
+rsd=Dinaro serbo
rub=Rublo Russo
rur=Rublo della CSI
rwf=Franco Ruandese
@@ -186,6 +208,7 @@
sbd=Dollaro delle Isole Solomon
scr=Rupia delle Seychelles
sdd=Dinaro Sudanese
+sdg=Sterlina sudanese
sek=Corona Svedese
sgd=Dollaro di Singapore
shp=Sterlina di Sant\u2019Elena
@@ -193,6 +216,7 @@
skk=Corona Slovacca
sll=Leone della Sierra Leone
sos=Scellino Somalo
+srd=Dollaro surinamese
srg=Fiorino del Suriname
std=Dobra di Sao Tom\u00e9 e Principe
svc=Col\u00f3n Salvadoregno
@@ -216,10 +240,12 @@
uyu=Peso Uruguayo uruguaiano
uzs=Sum dell\u2019Uzbekistan
veb=Bolivar Venezuelano
+vef=Bol\u00edvar venezuelano forte
vnd=Dong Vietnamita
vuv=Vatu di Vanuatu
wst=Tala della Samoa Occidentale
xaf=Franco CFA BEAC
+xag=Argento
xau=Oro
xba=Unit\u00e0 composita europea
xbb=Unit\u00e0 monetaria europea
@@ -230,6 +256,7 @@
xfo=Franco Oro Francese
xfu=Franco UIC Francese
xof=Franco CFA BCEAO
+xpd=Palladio
xpf=Franco CFP
xxx=Nessuna valuta
yer=Rial dello Yemen
--- a/jdk/src/share/classes/sun/util/resources/CurrencyNames_ja.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/util/resources/CurrencyNames_ja.properties Mon Apr 11 16:19:20 2011 -0700
@@ -1,45 +1,68 @@
#
-# Copyright (c) 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
#
#
# COPYRIGHT AND PERMISSION NOTICE
#
-# Copyright (C) 1991-2007 Unicode, Inc. All rights reserved.
+# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved.
# Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of the Unicode data files and any associated documentation (the "Data
-# Files") or Unicode software and any associated documentation (the
-# "Software") to deal in the Data Files or Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, and/or sell copies of the Data Files or Software, and
-# to permit persons to whom the Data Files or Software are furnished to do
-# so, provided that (a) the above copyright notice(s) and this permission
-# notice appear with all copies of the Data Files or Software, (b) both the
-# above copyright notice(s) and this permission notice appear in associated
-# documentation, and (c) there is clear notice in each modified Data File or
-# in the Software as well as in the documentation associated with the Data
-# File(s) or Software that the data or software has been modified.
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of the Unicode data files and any associated documentation (the
+# "Data Files") or Unicode software and any associated documentation
+# (the "Software") to deal in the Data Files or Software without
+# restriction, including without limitation the rights to use, copy,
+# modify, merge, publish, distribute, and/or sell copies of the Data
+# Files or Software, and to permit persons to whom the Data Files or
+# Software are furnished to do so, provided that (a) the above copyright
+# notice(s) and this permission notice appear with all copies of the
+# Data Files or Software, (b) both the above copyright notice(s) and
+# this permission notice appear in associated documentation, and (c)
+# there is clear notice in each modified Data File or in the Software as
+# well as in the documentation associated with the Data File(s) or
+# Software that the data or software has been modified.
#
-# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
-# THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
-# INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
-# CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-# USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+# ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR
+# ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR
+# SOFTWARE.
#
-# Except as contained in this notice, the name of a copyright holder shall not
-# be used in advertising or otherwise to promote the sale, use or other
-# dealings in these Data Files or Software without prior written
-# authorization of the copyright holder.
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in these Data Files or Software without prior
+# written authorization of the copyright holder.
+
#
-
# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
-
+#
adp=\u30a2\u30f3\u30c9\u30e9 \u30da\u30bb\u30bf
aed=UAE \u30c7\u30a3\u30eb\u30cf\u30e0
afa=\u30a2\u30d5\u30ac\u30cb\u30fc (1927-2002)
@@ -52,7 +75,8 @@
ats=\u30aa\u30fc\u30b9\u30c8\u30ea\u30a2 \u30b7\u30ea\u30f3\u30b0
aud=\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2 \u30c9\u30eb
awg=\u30a2\u30eb\u30d0 \u30ae\u30eb\u30c0\u30fc
-azm=\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3 \u30de\u30ca\u30c8
+azm=\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3 \u30de\u30ca\u30c8 (1993-2006)
+azn=\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3 \u30de\u30ca\u30c8
bam=\u30dc\u30b9\u30cb\u30a2 \u30de\u30eb\u30af (BAM)
bbd=\u30d0\u30eb\u30d0\u30c9\u30b9 \u30c9\u30eb
bdt=\u30d0\u30f3\u30b0\u30e9\u30c7\u30b7\u30e5 \u30bf\u30ab
@@ -102,7 +126,8 @@
frf=\u30d5\u30e9\u30f3\u30b9 \u30d5\u30e9\u30f3
gbp=\u82f1\u56fd\u30dd\u30f3\u30c9
gel=\u30b0\u30eb\u30b8\u30a2 \u30e9\u30ea
-ghc=\u30ac\u30fc\u30ca \u30bb\u30c7\u30a3
+ghc=\u30ac\u30fc\u30ca \u30bb\u30c7\u30a3 (1979-2007)
+ghs=\u30ac\u30fc\u30ca \u30bb\u30c7\u30a3
gip=\u30b8\u30d6\u30e9\u30eb\u30bf\u30eb \u30dd\u30f3\u30c9
gmd=\u30ac\u30f3\u30d3\u30a2 \u30c0\u30e9\u30b7
gnf=\u30ae\u30cb\u30a2 \u30d5\u30e9\u30f3
@@ -161,6 +186,7 @@
mxv=\u30e1\u30ad\u30b7\u30b3 UDI
myr=\u30de\u30ec\u30fc\u30b7\u30a2 \u30ea\u30f3\u30ae\u30c3\u30c8
mzm=\u30e2\u30b6\u30f3\u30d4\u30fc\u30af \u30e1\u30c6\u30a3\u30ab\u30eb
+mzn=\u30e2\u30b6\u30f3\u30d3\u30fc\u30af \u30e1\u30c6\u30a3\u30ab\u30eb
nad=\u30ca\u30df\u30d3\u30a2 \u30c9\u30eb
ngn=\u30ca\u30a4\u30b8\u30a7\u30ea\u30a2 \u30ca\u30a4\u30e9
nio=\u30cb\u30ab\u30e9\u30b0\u30a2 \u30b3\u30eb\u30c9\u30d0 \u30aa\u30ed
@@ -178,7 +204,9 @@
pte=\u30dd\u30eb\u30c8\u30ac\u30eb \u30a8\u30b9\u30af\u30fc\u30c9
pyg=\u30d1\u30e9\u30b0\u30a2\u30a4 \u30b0\u30a2\u30e9\u30cb
qar=\u30ab\u30bf\u30fc\u30eb \u30ea\u30a2\u30eb
-rol=\u30eb\u30fc\u30de\u30cb\u30a2 \u30ec\u30a4
+rol=\u30eb\u30fc\u30de\u30cb\u30a2 \u65e7\u30ec\u30a4
+ron=\u30eb\u30fc\u30de\u30cb\u30a2 \u30ec\u30a4
+rsd=\u30c7\u30a3\u30ca\u30fc\u30eb (\u30bb\u30eb\u30d3\u30a2)
rub=\u30ed\u30b7\u30a2 \u30eb\u30fc\u30d6\u30eb
rur=\u30ed\u30b7\u30a2 \u30eb\u30fc\u30d6\u30eb (1991-1998)
rwf=\u30eb\u30ef\u30f3\u30c0 \u30d5\u30e9\u30f3
@@ -186,6 +214,7 @@
sbd=\u30bd\u30ed\u30e2\u30f3\u8af8\u5cf6 \u30c9\u30eb
scr=\u30bb\u30a4\u30b7\u30a7\u30eb \u30eb\u30d4\u30fc
sdd=\u30b9\u30fc\u30c0\u30f3 \u30c7\u30a3\u30ca\u30fc\u30eb
+sdg=\u30b9\u30fc\u30c0\u30f3 \u30dd\u30f3\u30c9
sek=\u30b9\u30a6\u30a7\u30fc\u30c7\u30f3 \u30af\u30ed\u30fc\u30ca
sgd=\u30b7\u30f3\u30ac\u30dd\u30fc\u30eb \u30c9\u30eb
shp=\u30bb\u30f3\u30c8\u30d8\u30ec\u30ca\u5cf6 \u30dd\u30f3\u30c9
@@ -193,6 +222,7 @@
skk=\u30b9\u30ed\u30d0\u30ad\u30a2 \u30b3\u30eb\u30ca
sll=\u30b7\u30a8\u30e9\u30ec\u30aa\u30cd \u30ec\u30aa\u30f3
sos=\u30bd\u30de\u30ea\u30a2 \u30b7\u30ea\u30f3\u30b0
+srd=\u30b9\u30ea\u30ca\u30e0 \u30c9\u30eb
srg=\u30b9\u30ea\u30ca\u30e0 \u30ae\u30eb\u30c0\u30fc
std=\u30b5\u30f3\u30c8\u30e1\u30fb\u30d7\u30ea\u30f3\u30b7\u30da \u30c9\u30d6\u30e9
svc=\u30a8\u30eb\u30b5\u30eb\u30d0\u30c9\u30eb \u30b3\u30ed\u30f3
@@ -217,10 +247,12 @@
uyu=\u30a6\u30eb\u30b0\u30a2\u30a4 \u30da\u30bd
uzs=\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3 \u30b9\u30e0
veb=\u30d9\u30cd\u30ba\u30a8\u30e9 \u30dc\u30ea\u30d0\u30eb
+vef=\u30d9\u30cd\u30ba\u30a8\u30e9 \u30dc\u30ea\u30d0\u30eb\u30d5\u30a8\u30eb\u30c6
vnd=\u30d9\u30c8\u30ca\u30e0 \u30c9\u30f3
vuv=\u30d0\u30cc\u30a2\u30c4 \u30d0\u30c4
wst=\u897f\u30b5\u30e2\u30a2 \u30bf\u30e9
xaf=CFA \u30d5\u30e9\u30f3 BEAC
+xag=\u9280
xau=\u91d1
xba=\u30e8\u30fc\u30ed\u30c3\u30d1\u6df7\u5408\u5358\u4f4d (EURCO)
xbb=\u30e8\u30fc\u30ed\u30c3\u30d1\u901a\u8ca8\u5358\u4f4d (EMU-6)
@@ -231,8 +263,13 @@
xfo=\u30d5\u30e9\u30f3\u30b9\u91d1\u30d5\u30e9\u30f3
xfu=\u30d5\u30e9\u30f3\u30b9 UIC \u30d5\u30e9\u30f3
xof=CFA \u30d5\u30e9\u30f3 BCEAO
+xpd=\u30d1\u30e9\u30b8\u30a6\u30e0
xpf=CFP \u30d5\u30e9\u30f3
+xpt=\u30d7\u30e9\u30c1\u30ca
+xts=\u30c6\u30b9\u30c8\u7528\u901a\u8ca8\u30b3\u30fc\u30c9
+xxx=\u4e0d\u660e\u307e\u305f\u306f\u7121\u52b9\u306a\u901a\u8ca8
yer=\u30a4\u30a8\u30e1\u30f3 \u30ea\u30a2\u30eb
yum=\u30e6\u30fc\u30b4\u30b9\u30e9\u30d3\u30a2 \u30b9\u30fc\u30d1\u30fc \u30c7\u30a3\u30ca\u30fc\u30eb
zar=\u5357\u30a2\u30d5\u30ea\u30ab \u30e9\u30f3\u30c9
+zmk=\u30b6\u30f3\u30d3\u30a2 \u30af\u30ef\u30c1\u30e3
zwd=\u30b8\u30f3\u30d0\u30d6\u30a8 \u30c9\u30eb
--- a/jdk/src/share/classes/sun/util/resources/CurrencyNames_ko.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/util/resources/CurrencyNames_ko.properties Mon Apr 11 16:19:20 2011 -0700
@@ -1,58 +1,82 @@
#
-# Copyright (c) 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
#
#
# COPYRIGHT AND PERMISSION NOTICE
#
-# Copyright (C) 1991-2007 Unicode, Inc. All rights reserved.
+# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved.
# Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of the Unicode data files and any associated documentation (the "Data
-# Files") or Unicode software and any associated documentation (the
-# "Software") to deal in the Data Files or Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, and/or sell copies of the Data Files or Software, and
-# to permit persons to whom the Data Files or Software are furnished to do
-# so, provided that (a) the above copyright notice(s) and this permission
-# notice appear with all copies of the Data Files or Software, (b) both the
-# above copyright notice(s) and this permission notice appear in associated
-# documentation, and (c) there is clear notice in each modified Data File or
-# in the Software as well as in the documentation associated with the Data
-# File(s) or Software that the data or software has been modified.
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of the Unicode data files and any associated documentation (the
+# "Data Files") or Unicode software and any associated documentation
+# (the "Software") to deal in the Data Files or Software without
+# restriction, including without limitation the rights to use, copy,
+# modify, merge, publish, distribute, and/or sell copies of the Data
+# Files or Software, and to permit persons to whom the Data Files or
+# Software are furnished to do so, provided that (a) the above copyright
+# notice(s) and this permission notice appear with all copies of the
+# Data Files or Software, (b) both the above copyright notice(s) and
+# this permission notice appear in associated documentation, and (c)
+# there is clear notice in each modified Data File or in the Software as
+# well as in the documentation associated with the Data File(s) or
+# Software that the data or software has been modified.
#
-# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
-# THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
-# INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
-# CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-# USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+# ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR
+# ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR
+# SOFTWARE.
#
-# Except as contained in this notice, the name of a copyright holder shall not
-# be used in advertising or otherwise to promote the sale, use or other
-# dealings in these Data Files or Software without prior written
-# authorization of the copyright holder.
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in these Data Files or Software without prior
+# written authorization of the copyright holder.
+
#
-
# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
-
+#
adp=\uc548\ub3c4\ub77c \ud398\uc138\ud0c0
-aed=\uc544\ub78d\uc5d0\ubbf8\ub808\uc774\ud2b8 \ub514\ub098\ub974
+aed=\uc544\ub78d\uc5d0\ubbf8\ub9ac\ud2b8 \ub514\ub974\ud568
afa=\uc544\ud504\uac00\ub2c8 (1927-2002)
afn=\uc544\ud504\uac00\ub2c8
all=\uc54c\ubc14\ub2c8\uc544 \ub808\ud06c
amd=\uc544\ub974\uba54\ub2c8\uc544 \ub4dc\ub78c
-ang=\ub124\ub378\ub780\ub4dc \uc548\ud2f8\ub808\uc2a4 \uad74\ub374
+ang=\ub124\ub35c\ub780\ub4dc\ub839 \uc548\ud2f8\ub808\uc2a4 \uae38\ub354
aoa=\uc559\uace8\ub77c \ucf74\uc790
ars=\uc544\ub974\ud5e8\ud2f0\ub098 \ud398\uc18c
ats=\ud638\uc8fc \uc2e4\ub9c1
aud=\ud638\uc8fc \ub2ec\ub7ec
awg=\uc544\ub8e8\ubc14 \uae38\ub354
-azm=\uc544\uc81c\ub974\ubc14\uc774\uc820 \ub9c8\ub098\ud2b8
+azm=\uc544\uc81c\ub974\ubc14\uc774\uc820 \ub9c8\ub098\ud2b8(1993-2006)
+azn=\uc544\uc81c\ub974\ubc14\uc774\uc794 \ub9c8\ub098\ud2b8
bam=\ubcf4\uc2a4\ub2c8\uc544-\ud5e4\ub974\uccb4\uace0\ube44\ub098 \ud0dc\ud658 \ub9c8\ub974\ud06c
bbd=\ubc14\ubca0\uc774\ub3c4\uc2a4 \ub2ec\ub7ec
bdt=\ubc29\uae00\ub77c\ub370\uc2dc \ud0c0\uce74
@@ -64,6 +88,7 @@
bmd=\ubc84\ubba4\ub2e4 \ub2ec\ub7ec
bnd=\ubd80\ub8e8\ub098\uc774 \ub2ec\ub7ec
bob=\ubcfc\ub9ac\ube44\uc544\ub178
+bov=\ubcfc\ub9ac\ube44\uc544\ub178 Mvdol(\uae30\uae08)
brl=\ube0c\ub77c\uc9c8 \ub808\uc54c
bsd=\ubc14\ud558\ub9c8 \ub2ec\ub7ec
btn=\ubd80\ud0c4 \ub20c\ud22c\ub214
@@ -73,11 +98,13 @@
bzd=\ubca8\ub9ac\uc988 \ub2ec\ub7ec
cad=\uce90\ub098\ub2e4 \ub2ec\ub7ec
cdf=\ucf69\uace0 \ud504\ub791 \ucf69\uace8\ub77c\uc2a4
-chf=\uc2a4\uc704\uc2a4 \ud504\ub791\ub2ec\ub7ec
+chf=\uc2a4\uc704\uc2a4 \ud504\ub791
+clf=\uce60\ub808 UF (Unidades de Fomento)
clp=\uce60\ub808 \ud398\uc18c
cny=\uc911\uad6d \uc704\uc548 \uc778\ubbfc\ud3d0
cop=\ucf5c\ub86c\ube44\uc544 \ud398\uc18c
crc=\ucf54\uc2a4\ud0c0\ub9ac\uce74 \ucf5c\ub860
+csd=\uace0 \uc138\ub974\ube44\uc544 \ub514\ub098\ub974
cup=\ucfe0\ubc14 \ud398\uc18c
cve=\uce74\ubcf4\ubca0\ub974\ub370 \uc5d0\uc2a4\ucfe0\ub3c4
cyp=\uc2f8\uc774\ud504\ub7ec\uc2a4 \ud30c\uc6b4\ub4dc
@@ -99,7 +126,8 @@
frf=\ud504\ub791\uc2a4 \ud504\ub791
gbp=\uc601\uad6d\ub839 \ud30c\uc6b4\ub4dc \uc2a4\ud138\ub9c1
gel=\uadf8\ub8e8\uc9c0\uc57c \ub77c\ub9ac
-ghc=\uac00\ub098 \uc2dc\ub514
+ghc=\uac00\ub098 \uc2dc\ub514 (1979-2007)
+ghs=\uac00\ub098 \uc2dc\ub514
gip=\uc9c0\ube0c\ub864\ud130 \ud30c\uc6b4\ub4dc
gmd=\uac10\ube44\uc544 \ub2ec\ub77c\uc2dc
gnf=\uae30\ub2c8 \ud504\ub791
@@ -155,8 +183,10 @@
mvr=\ubab0\ub514\ube0c \uc81c\ub3c4 \ub8e8\ud53c\uc544
mwk=\ub9d0\ub77c\uc704 \ucf70\uccd0
mxn=\uba55\uc2dc\ucf54 \ud398\uc18c
-myr=\ub9d0\ub808\uc774\uc9c0\uc544 \ub9c1\uae30\ud2b8
-mzm=\ubaa8\uc7a0\ube44\ud06c \uba54\ud2f0\uce7c
+mxv=\uba55\uc2dc\ucf54 UDI(Unidad de Inversion)
+myr=\ub9d0\ub808\uc774\uc2dc\uc544 \ub9c1\uae43
+mzm=\uace0 \ubaa8\uc7a0\ube44\ud06c \uba54\ud2f0\uce7c
+mzn=\ubaa8\uc7a0\ube44\ud06c \uba54\ud2f0\uce7c
nad=\ub098\ubbf8\ube44\uc544 \ub2ec\ub7ec
ngn=\ub2c8\uc81c\ub974 \ub098\uc774\ub77c
nio=\ub2c8\uce74\ub77c\uacfc \ucf54\ub974\ub3c4\ubc14 \uc624\ub85c
@@ -175,6 +205,8 @@
pyg=\ud30c\ub77c\uacfc\uc774 \uacfc\ub77c\ub2c8
qar=\uce74\ud0c0\ub974 \ub9ac\uc584
rol=\ub8e8\ub9c8\ub2c8\uc544 \ub808\uc774
+ron=\ub8e8\ub9c8\ub2c8\uc544 \ub808\uc6b0
+rsd=\uc138\ub974\ube44\uc544 \ub514\ub098\ub974
rub=\ub7ec\uc2dc\uc544 \ub8e8\ube14
rur=\ub7ec\uc2dc\uc544 \ub8e8\ube14 (1991-1998)
rwf=\ub974\uc644\ub2e4 \ud504\ub791
@@ -182,6 +214,7 @@
sbd=\uc194\ub85c\ubaac \uc81c\ub3c4 \ub2ec\ub7ec
scr=\uc138\uc774\uc274 \ub8e8\ud53c
sdd=\uc218\ub2e8 \ub514\ub098\ub974
+sdg=\uc218\ub2e8 \ud30c\uc6b4\ub4dc
sek=\uc2a4\uc6e8\ub374 \ud06c\ub85c\ub098
sgd=\uc2f1\uac00\ud3f4 \ub2ec\ub7ec
shp=\uc138\uc778\ud2b8\ud5ec\ub808\ub098 \ud30c\uc6b4\ub4dc
@@ -189,6 +222,7 @@
skk=\uc2ac\ub85c\ubc14\ud0a4\uc544 \ucf54\ub8e8\ub098
sll=\uc2dc\uc5d0\ub77c\ub9ac\uc628 \ub9ac\uc628
sos=\uc18c\ub9d0\ub9ac\uc544 \uc2e4\ub9c1
+srd=\uc218\ub9ac\ub0a8 \ub2ec\ub7ec
srg=\uc218\ub9ac\ub0a8 \uae38\ub354
std=\uc0c1\ud22c\uba54 \ud504\ub9b0\uc2dc\ud398 \ub3c4\ube0c\ub77c
svc=\uc5d8\uc0b4\ubc14\ub3c4\ub974 \ucf5c\ub860
@@ -198,28 +232,44 @@
tjs=\ud0c0\uc9c0\ud0a4\uc2a4\ud0c4 \uc18c\ubaa8\ub2c8
tmm=\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4 \ub9c8\ub098\ud2b8
tnd=\ud280\ub2c8\uc9c0 \ub514\ub098\ub974
+top=\ud1b5\uac00 \ud30c\uc559\uac00
tpe=\ud2f0\ubaa8\ub974 \uc5d0\uc2a4\ucfe0\ub3c4
-trl=\ud130\uae30 \ub9ac\ub77c
-try=\uc0c8\ub85c\uc6b4 \ud130\ud0a4 \ub9ac\ub77c
+trl=\ud130\ud0a4 \ub9ac\ub77c
+try=\uc2e0 \ud130\ud0a4 \ub9ac\ub77c
ttd=\ud2b8\ub9ac\ub2c8\ub2e4\ub4dc \ud1a0\ubc14\uace0 \ub2ec\ub7ec
twd=\ub300\ub9cc \uc2e0\uad8c \ub2ec\ub7ec
tzs=\ud0c4\uc790\ub2c8\uc544 \uc2e4\ub9c1
uah=\uc6b0\ud06c\ub77c\uc774\ub098 \uadf8\ub9ac\ube0c\ub098
ugx=\uc6b0\uac04\ub2e4 \uc2e4\ub9c1
usd=\ubbf8\uad6d \ub2ec\ub7ec
+usn=\ubbf8\uad6d \ub2ec\ub7ec(\ub2e4\uc74c\ub0a0)
+uss=\ubbf8\uad6d \ub2ec\ub7ec(\ub2f9\uc77c)
uyu=\uc6b0\ub8e8\uacfc\uc774 \ud398\uc18c \uc6b0\ub8e8\uacfc\uc694
uzs=\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4 \uc228
veb=\ubca0\ub124\uc8fc\uc5d8\ub77c \ubcfc\ub9ac\ubc14\ub974
+vef=\ubca0\ub124\uc8fc\uc5d8\ub77c \ubcfc\ub9ac\ubc14\ub974 \ud478\uc5d0\ub974\ub5bc
vnd=\ubca0\ud2b8\ub0a8 \ub3d9
vuv=\ubc14\ub204\uc544\ud22c \ubc14\ud22c
wst=\uc11c \uc0ac\ubaa8\uc544 \ud0c8\ub77c
+xaf=CFA \ud504\ub791 BEAC
+xag=\uc740\ud654
xau=\uae08
+xba=\uc720\ub974\ucf54 (\uc720\ub7fd \ud68c\uacc4 \ub2e8\uc704)
+xbb=\uc720\ub7fd \ud1b5\ud654 \ub3d9\ub9f9
+xbc=\uc720\ub7fd \uacc4\uc0b0 \ub2e8\uc704 (XBC)
+xbd=\uc720\ub7fd \uacc4\uc0b0 \ub2e8\uc704 (XBD)
xcd=\ub3d9\uce74\ub9ac\ube0c \ub2ec\ub7ec
xdr=\ud2b9\ubcc4\uc778\ucd9c\uad8c
xfo=\ud504\ub791\uc2a4 Gold \ud504\ub791
xfu=\ud504\ub791\uc2a4 UIC-\ud504\ub791
+xof=CFA \ud504\ub791 BCEAO
+xpd=\ud314\ub77c\ub4d0
+xpf=CFP \ud504\ub791
+xpt=\ubc31\uae08
+xts=\ud14c\uc2a4\ud2b8 \ud1b5\ud654 \ucf54\ub4dc
+xxx=\uc54c\uc218\uc5c6\uac70\ub098 \uc720\ud6a8\ud558\uc9c0\uc54a\uc740 \ud1b5\ud654\ub2e8\uc704
yer=\uc608\uba58 \ub9ac\uc54c
yum=\uc720\uace0\uc2ac\ub77c\ube44\uc544 \ub178\ube44 \ub514\ub098\ub974
zar=\ub0a8\uc544\ud504\ub9ac\uce74 \ub79c\ub4dc
zmk=\uc7d8\ube44\uc544 \ucf70\uccd0
-zwd=\uc9d0\ube44\ube0c\uc6e8 \ub2ec\ub7ec
+zwd=\uc9d0\ubc14\ube0c\uc6e8 \ub2ec\ub7ec
--- a/jdk/src/share/classes/sun/util/resources/CurrencyNames_sv.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/util/resources/CurrencyNames_sv.properties Mon Apr 11 16:19:20 2011 -0700
@@ -1,230 +1,271 @@
#
-# Copyright (c) 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
#
#
# COPYRIGHT AND PERMISSION NOTICE
#
-# Copyright (C) 1991-2007 Unicode, Inc. All rights reserved.
+# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved.
# Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of the Unicode data files and any associated documentation (the "Data
-# Files") or Unicode software and any associated documentation (the
-# "Software") to deal in the Data Files or Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, and/or sell copies of the Data Files or Software, and
-# to permit persons to whom the Data Files or Software are furnished to do
-# so, provided that (a) the above copyright notice(s) and this permission
-# notice appear with all copies of the Data Files or Software, (b) both the
-# above copyright notice(s) and this permission notice appear in associated
-# documentation, and (c) there is clear notice in each modified Data File or
-# in the Software as well as in the documentation associated with the Data
-# File(s) or Software that the data or software has been modified.
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of the Unicode data files and any associated documentation (the
+# "Data Files") or Unicode software and any associated documentation
+# (the "Software") to deal in the Data Files or Software without
+# restriction, including without limitation the rights to use, copy,
+# modify, merge, publish, distribute, and/or sell copies of the Data
+# Files or Software, and to permit persons to whom the Data Files or
+# Software are furnished to do so, provided that (a) the above copyright
+# notice(s) and this permission notice appear with all copies of the
+# Data Files or Software, (b) both the above copyright notice(s) and
+# this permission notice appear in associated documentation, and (c)
+# there is clear notice in each modified Data File or in the Software as
+# well as in the documentation associated with the Data File(s) or
+# Software that the data or software has been modified.
#
-# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
-# THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
-# INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
-# CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-# USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+# ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR
+# ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR
+# SOFTWARE.
#
-# Except as contained in this notice, the name of a copyright holder shall not
-# be used in advertising or otherwise to promote the sale, use or other
-# dealings in these Data Files or Software without prior written
-# authorization of the copyright holder.
-#
-
-# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in these Data Files or Software without prior
+# written authorization of the copyright holder.
-adp=Andorransk peseta
-aed=F\u00f6renade arabemiratens dirham
-afa=afro-asiatiskt spr\u00e5k (annat)
-all=Albansk lek
-amd=Armenisk dram
-ang=Nederl\u00e4ndsk antillisk gulden
-aoa=Angolansk kwanza
-ars=Argentinsk peso
-ats=\u00d6sterrikisk schilling
-aud=Australisk dollar
-awg=Aruba-florin
-azm=Azerbajdzjansk manat
-bam=Konvertibel bosnisk-hercegovinsk mark
-bbd=Barbadisk dollar
-bdt=Bangladeshisk taka
-bef=Belgisk franc
-bgl=Bulgarisk h\u00e5rd lev
-bgn=Bulgarisk ny lev
-bhd=Bahrainsk dinar
-bif=Burundisk franc
+#
+# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
+#
+adp=andorransk peseta
+aed=F\u00f6renade Arabemiratens dirham
+afa=afghani (1927-2002)
+afn=afghani
+all=albansk lek
+amd=armenisk dram
+ang=Nederl\u00e4ndska Antillernas gulden
+aoa=angolansk kwanza
+ars=argentinsk peso
+ats=\u00f6sterrikisk schilling
+aud=australisk dollar
+awg=Aruba-gulden
+azm=azerbajdzjansk manat (1993-2006)
+azn=azerbajdzjansk manat
+bam=bosnisk-hercegovinsk mark (konvertibel)
+bbd=Barbados-dollar
+bdt=bangladeshisk taka
+bef=belgisk franc
+bgn=bulgarisk ny lev
+bhd=Bahrain-dinar
+bif=burundisk franc
bmd=Bermuda-dollar
-bnd=Bruneisk dollar
-bov=Boliviansk mvdol
-brl=Brasiliansk real
-bsd=Bahamansk dollar
-btn=Bhutanesisk ngultrum
-bwp=Botswansk pula
-byb=Vitrysk ny rubel (1994-1999)
-byr=Vitrysk rubel
-bzd=Belizisk dollar
-cad=Kanadensisk dollar
-cdf=Kongolesisk franc congolais
-chf=Schweizisk franc
-clf=Chilensk unidad de fomento
-clp=Chilensk peso
-cny=Kinesisk yuan renminbi
-cop=Colombiansk peso
-crc=Costarikansk col\u00f3n
-cup=Kubansk peso
-cve=Kapverdisk escudo
-cyp=Cypriotiskt pund
-czk=Tjeckisk koruna
-dem=Tysk mark
-djf=Djiboutisk franc
-dkk=Dansk krona
-dop=Dominikansk peso
-dzd=Algerisk dinar
-eek=Estnisk krona
-egp=Egyptiskt pund
-ern=Eritreansk nakfa
-esp=Spansk peseta
-etb=Etiopisk birr
-eur=Euro
-fim=Finsk mark
-fjd=Fijiansk dollar
+bnd=Brunei-dollar
+bob=boliviano
+bov=boliviansk mvdol
+brl=brasiliansk real
+bsd=Bahamas-dollar
+btn=bhutanesisk ngultrum
+bwp=botswansk pula
+byb=vitrysk ny rubel (1994-1999)
+byr=vitrysk rubel
+bzd=belizisk dollar
+cad=kanadensisk dollar
+cdf=kongolesisk franc
+chf=schweizisk franc
+clf=chilensk unidad de fomento
+clp=chilensk peso
+cny=kinesisk yuan renminbi
+cop=colombiansk peso
+crc=costarikansk col\u00f3n
+csd=jugoslavisk dinar
+cup=kubansk peso
+cve=kapverdisk escudo
+cyp=cypriotiskt pund
+czk=tjeckisk koruna
+dem=tysk mark
+djf=djiboutisk franc
+dkk=dansk krona
+dop=dominikansk peso
+dzd=algerisk dinar
+eek=estnisk krona
+egp=egyptiskt pund
+ern=eritreansk nakfa
+esp=spansk peseta
+etb=etiopisk birr
+eur=euro
+fim=finsk mark
+fjd=Fiji-dollar
fkp=Falklands\u00f6arnas pund
-frf=Fransk franc
-gbp=Brittiskt pund sterling
-gel=Georgisk lari
-ghc=Ghanansk cedi
-gip=Gibraltiskt pund
-gmd=Gambisk dalasi
-gnf=Guineansk franc
-grd=Grekisk drachma
-gtq=Guatemalansk quetzal
+frf=fransk franc
+gbp=brittiskt pund sterling
+gel=georgisk lari
+ghc=ghanansk cedi (1979-2007)
+ghs=ghanansk cedi
+gip=gibraltiskt pund
+gmd=gambisk dalasi
+gnf=guineansk franc
+grd=grekisk drachma
+gtq=guatemalansk quetzal
gwp=Guinea-Bissau-peso
-gyd=Guyanansk dollar
+gyd=guyanansk dollar
hkd=Hongkong-dollar
-hnl=Hoduransk lempira
-hrk=Kroatisk kuna
-htg=Haitisk gourde
-huf=Ungersk forint
-idr=Indonesisk rupiah
-iep=Irl\u00e4ndskt pund
-ils=Israelisk ny shekel
-inr=Indisk rupie
-iqd=Irakisk dinar
-irr=Iransk rial
-isk=Isl\u00e4ndsk krona
-itl=Italiensk lira
-jmd=Jamaicansk dollar
-jod=Jordansk dinar
-jpy=Japansk yen
-kes=Kenyansk shilling
-kgs=Kirgizistansk som
-khr=Kambodjansk riel
-kmf=Komorisk franc
-kpw=Nordkoreansk won
-krw=Sydkoreansk won
-kwd=Kuwaitisk dinar
+hnl=honduransk lempira
+hrk=kroatisk kuna
+htg=haitisk gourde
+huf=ungersk forint
+idr=indonesisk rupiah
+iep=irl\u00e4ndskt pund
+ils=israelisk ny shekel
+inr=indisk rupie
+iqd=irakisk dinar
+irr=iransk rial
+isk=isl\u00e4ndsk krona
+itl=italiensk lira
+jmd=Jamaica-dollar
+jod=jordansk dinar
+jpy=japansk yen
+kes=kenyansk shilling
+kgs=kirgizisk som
+khr=kambodjansk riel
+kmf=komorisk franc
+kpw=nordkoreansk won
+krw=sydkoreansk won
+kwd=kuwaitisk dinar
kyd=Cayman-dollar
-kzt=Kazakisk tenge
-lak=Laotisk kip
-lbp=Libanesiskt pund
-lkr=Srilankesisk rupie
-lrd=Liberisk dollar
-lsl=Lesothisk loti
-ltl=Lettisk lita
-luf=Luxemburgsk franc
-lvl=Lettisk lats
-lyd=Libysk dinar
-mad=Marockansk dirham
-mdl=Moldavisk leu
-mga=Madagaskisk ariary
-mgf=Madagaskisk franc
-mkd=Makedonisk denar
-mmk=Myanmarisk kyat
-mnt=Mongolisk tugrik
-mop=Macaoisk pataca
-mro=Mauretansk ouguiya
-mtl=Maltesisk lira
-mur=Mauritisk rupie
-mvr=Maldivisk rufiyaa
-mwk=Malawisk kwacha
-mxn=Mexikansk peso
-mxv=Mexikansk Unidad de Inversion (UDI)
-myr=Malaysisk ringgit
-mzm=Mo\u00e7ambikisk metical
-nad=Namibisk dollar
-ngn=Nigeriansk naira
-nio=Nicaraguansk c\u00f3rdoba oro
-nlg=Nederl\u00e4ndsk gulden
-nok=Norsk krona
-npr=Nepalesisk rupie
-nzd=Nyzeel\u00e4ndsk dollar
-omr=Omansk rial
-pab=Panamansk balboa
-pen=Peruansk sol nuevo
-pgk=Papuansk kina
-php=Filippinsk peso
-pkr=Pakistansk rupie
-pln=Polsk zloty
-pte=Portugisisk escudo
-pyg=Paraguaysk guarani
-qar=Qatarisk rial
-rol=Rum\u00e4nsk leu
-rub=Rysk rubel
-rur=Rysk rubel (1991-1998)
-rwf=Rwandisk franc
-sar=Saudisk riyal
+kzt=kazakisk tenge
+lak=laotisk kip
+lbp=libanesiskt pund
+lkr=srilankesisk rupie
+lrd=Liberia-dollar
+lsl=lesothisk loti
+ltl=litauisk litas
+luf=luxemburgsk franc
+lvl=lettisk lats
+lyd=libysk dinar
+mad=marockansk dirham
+mdl=moldavisk leu
+mga=madagaskisk ariary
+mgf=madagaskisk franc
+mkd=makedonisk denar
+mmk=myanmarisk kyat
+mnt=mongolisk tugrik
+mop=Macao-pataca
+mro=mauretansk ouguiya
+mtl=maltesisk lira
+mur=mauritisk rupie
+mvr=maldivisk rufiyaa
+mwk=malawisk kwacha
+mxn=mexikansk peso
+mxv=mexikansk unidad de inversion
+myr=malaysisk ringgit
+mzm=gammal mo\u00e7ambikisk metical
+mzn=mo\u00e7ambikisk metical
+nad=Namibia-dollar
+ngn=nigeriansk naira
+nio=nicaraguansk c\u00f3rdoba oro
+nlg=nederl\u00e4ndsk gulden
+nok=norsk krona
+npr=nepalesisk rupie
+nzd=nyzeel\u00e4ndsk dollar
+omr=omansk rial
+pab=panamansk balboa
+pen=peruansk sol nuevo
+pgk=papuansk kina
+php=filippinsk peso
+pkr=pakistansk rupie
+pln=polsk zloty
+pte=portugisisk escudo
+pyg=paraguaysk guarani
+qar=qatarisk rial
+rol=gammal rum\u00e4nsk leu
+ron=rum\u00e4nsk leu
+rsd=Serbisk dinar
+rub=rysk rubel
+rur=rysk rubel (1991-1998)
+rwf=rwandisk franc
+sar=saudisk riyal
sbd=Salomon-dollar
-scr=Seychellisk rupie
-sdd=Sudanesisk dinar
-sek=Svensk krona
-sgd=Singaporiansk dollar
+scr=seychellisk rupie
+sdd=sudanesisk dinar
+sdg=sudanesiskt pund
+sek=svensk krona
+sgd=Singapore-dollar
shp=S\:t Helena-pund
-sit=Slovensk tolar
-skk=Slovakisk koruna
-sll=Sierraleonsk leone
-sos=Somalisk shilling
-srg=Surinamesisk gulden
+sit=slovensk tolar
+skk=slovakisk koruna
+sll=sierraleonsk leone
+sos=somalisk shilling
+srd=Surinam-dollar
+srg=surinamesisk gulden
std=S\u00e3o Tom\u00e9 och Pr\u00edncipe-dobra
-svc=Salvadoransk col\u00f3n
-syp=Syriskt pund
-szl=Swazil\u00e4ndsk lilangeni
-thb=Thail\u00e4ndsk baht
-tjs=Tadzjikisk somoni
-tmm=Turkmensk manat
-tnd=Tunisisk dinar
-top=Tongansk pa\u02bbanga
-tpe=Timoriansk escudo
-trl=Turkisk lira
-try=Ny turkisk lira
-ttd=Trinidadisk dollar
-twd=Taiwanesisk ny dollar
-tzs=Tanzanisk shilling
-uah=Ukrainsk hryvnia
-ugx=Ugandisk shilling
+svc=salvadoransk col\u00f3n
+syp=syriskt pund
+szl=swazil\u00e4ndsk lilangeni
+thb=thail\u00e4ndsk baht
+tjs=tadzjikisk somoni
+tmm=turkmensk manat
+tnd=tunisisk dinar
+top=tongansk pa\u02bbanga
+tpe=timoriansk escudo
+trl=gammal turkisk lira
+try=ny turkisk lira
+ttd=Trinidad ochTobago-dollar
+twd=taiwanesisk ny dollar
+tzs=tanzanisk shilling
+uah=ukrainsk hryvnia
+ugx=ugandisk shilling
usd=US-dollar
usn=US-dollar (n\u00e4sta dag)
uss=US-dollar (samma dag)
-uyu=Uruguayansk peso uruguayo
-uzs=Uzbekisk sum
-veb=Venezuelansk bolivar
-vnd=Vietnamesisk dong
-vuv=Vanuatisk vatu
-wst=V\u00e4stsamoansk tala
-xaf=CFA Franc BEAC
-xcd=\u00d6stkaribisk dollar
-xfo=Fransk guldfranc
-xfu=French UIC-Franc
-xof=CFA Franc BCEAO
+uyu=uruguayansk peso
+uzs=uzbekisk sum
+veb=venezuelansk bolivar
+vef=venezuelansk bolivar fuerte
+vnd=vietnamesisk dong
+vuv=vanuatisk vatu
+wst=v\u00e4stsamoansk tala
+xag=silver
+xau=guld
+xba=europeisk kompositenhet
+xbb=europeisk monet\u00e4r enhet
+xbc=europeisk kontoenhet (XBC)
+xbd=europeisk kontoenhet (XBD)
+xcd=\u00f6stkaribisk dollar
+xdr=IMF s\u00e4rskild dragningsr\u00e4tt
+xfo=fransk guldfranc
+xpd=palladium
xpf=CFP-franc
-yer=Jemenitisk rial
-yum=Dinar (Serbien och Montenegro)
-zar=Sydafrikansk rand
-zmk=Zambisk kwacha
-zwd=Zimbabwisk dollar
+xpt=platina
+xts=test-valutakod
+xxx=ok\u00e4nd eller ogiltig valuta
+yer=jemenitisk rial
+yum=jugoslavisk ny dinar
+zar=sydafrikansk rand
+zmk=zambisk kwacha
+zwd=Zimbabwe-dollar
--- a/jdk/src/share/classes/sun/util/resources/CurrencyNames_zh_CN.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/util/resources/CurrencyNames_zh_CN.properties Mon Apr 11 16:19:20 2011 -0700
@@ -1,45 +1,68 @@
#
-# Copyright (c) 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
#
#
# COPYRIGHT AND PERMISSION NOTICE
#
-# Copyright (C) 1991-2007 Unicode, Inc. All rights reserved.
+# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved.
# Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of the Unicode data files and any associated documentation (the "Data
-# Files") or Unicode software and any associated documentation (the
-# "Software") to deal in the Data Files or Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, and/or sell copies of the Data Files or Software, and
-# to permit persons to whom the Data Files or Software are furnished to do
-# so, provided that (a) the above copyright notice(s) and this permission
-# notice appear with all copies of the Data Files or Software, (b) both the
-# above copyright notice(s) and this permission notice appear in associated
-# documentation, and (c) there is clear notice in each modified Data File or
-# in the Software as well as in the documentation associated with the Data
-# File(s) or Software that the data or software has been modified.
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of the Unicode data files and any associated documentation (the
+# "Data Files") or Unicode software and any associated documentation
+# (the "Software") to deal in the Data Files or Software without
+# restriction, including without limitation the rights to use, copy,
+# modify, merge, publish, distribute, and/or sell copies of the Data
+# Files or Software, and to permit persons to whom the Data Files or
+# Software are furnished to do so, provided that (a) the above copyright
+# notice(s) and this permission notice appear with all copies of the
+# Data Files or Software, (b) both the above copyright notice(s) and
+# this permission notice appear in associated documentation, and (c)
+# there is clear notice in each modified Data File or in the Software as
+# well as in the documentation associated with the Data File(s) or
+# Software that the data or software has been modified.
#
-# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
-# THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
-# INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
-# CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-# USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+# ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR
+# ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR
+# SOFTWARE.
#
-# Except as contained in this notice, the name of a copyright holder shall not
-# be used in advertising or otherwise to promote the sale, use or other
-# dealings in these Data Files or Software without prior written
-# authorization of the copyright holder.
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in these Data Files or Software without prior
+# written authorization of the copyright holder.
+
#
-
# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
-
+#
CNY=\uffe5
cny=\u4eba\u6c11\u5e01
adp=\u5b89\u9053\u5c14\u6bd4\u585e\u5854
@@ -48,13 +71,14 @@
afn=\u963f\u5bcc\u6c57\u5c3c
all=\u963f\u5c14\u5df4\u5c3c\u4e9a\u5217\u514b
amd=\u4e9a\u7f8e\u5c3c\u4e9a\u5fb7\u62c9\u59c6
-ang=\u53e4\u82f1\u6587
+ang=\u8377\u5170\u5b89\u66ff\u5170\u76fe
aoa=\u5b89\u54e5\u62c9\u5bbd\u624e
ars=\u963f\u6839\u5ef7\u6bd4\u7d22
ats=\u5965\u5730\u5229\u5148\u4ee4
aud=\u6fb3\u5927\u5229\u4e9a\u5143
awg=\u963f\u9c81\u5df4\u57fa\u5c14\u5fb7\u5143
-azm=\u963f\u585e\u62dc\u7586\u9a6c\u7eb3\u7279
+azm=\u963f\u585e\u62dc\u7586\u9a6c\u7eb3\u7279 (1993-2006)
+azn=\u963f\u585e\u62dc\u7586\u9a6c\u7eb3\u7279
bam=\u6ce2\u58eb\u5c3c\u4e9a-\u8d6b\u585e\u54e5\u7ef4\u7eb3\u5151\u6362\u5238
bbd=\u5df4\u5df4\u591a\u65af\u5143
bdt=\u5b5f\u52a0\u62c9\u5854\u5361
@@ -81,7 +105,7 @@
clp=\u667a\u5229\u6bd4\u7d22
cop=\u54e5\u4f26\u6bd4\u4e9a\u6bd4\u7d22
crc=\u54e5\u65af\u8fbe\u9ece\u52a0\u79d1\u6717
-csd=\u585e\u5c14\u7ef4\u4e9a\u7b2c\u7eb3\u5c14
+csd=\u65e7\u585e\u5c14\u7ef4\u4e9a\u7b2c\u7eb3\u5c14
cup=\u53e4\u5df4\u6bd4\u7d22
cve=\u4f5b\u5f97\u89d2\u57c3\u65af\u5e93\u591a
cyp=\u585e\u6d66\u8def\u65af\u9551
@@ -104,6 +128,7 @@
gbp=\u82f1\u9551
gel=\u4e54\u6cbb\u4e9a\u62c9\u745e
ghc=\u52a0\u7eb3\u585e\u7b2c
+ghs=\u52a0\u7eb3\u585e\u5730
gip=\u76f4\u5e03\u7f57\u9640\u9551
gmd=\u5188\u6bd4\u4e9a\u8fbe\u62c9\u897f
gnf=\u51e0\u5185\u4e9a\u6cd5\u90ce
@@ -161,7 +186,8 @@
mxn=\u58a8\u897f\u54e5\u6bd4\u7d22
mxv=\u58a8\u897f\u54e5 Unidad de Inversion (UDI)\uff08\u8d44\u91d1\uff09
myr=\u9a6c\u6765\u897f\u4e9a\u6797\u5409\u7279
-mzm=\u83ab\u6851\u6bd4\u514b\u6885\u8482\u5361\u5c14
+mzm=\u65e7\u83ab\u6851\u6bd4\u514b\u7f8e\u63d0\u5361
+mzn=\u83ab\u6851\u6bd4\u514b\u7f8e\u63d0\u5361
nad=\u7eb3\u7c73\u6bd4\u4e9a\u5143
ngn=\u5c3c\u65e5\u5229\u4e9a\u5948\u62c9
nio=\u5c3c\u52a0\u62c9\u74dc\u91d1\u79d1\u591a\u5df4
@@ -180,6 +206,8 @@
pyg=\u5df4\u62c9\u572d\u74dc\u62c9\u5c3c
qar=\u5361\u5854\u5c14\u91cc\u4e9a\u5c14
rol=\u65e7\u7f57\u9a6c\u5c3c\u4e9a\u5217\u4f0a
+ron=\u7f57\u9a6c\u5c3c\u4e9a\u5217\u4f0a
+rsd=\u585e\u5c14\u7ef4\u4e9a\u7b2c\u7eb3\u5c14
rub=\u4fc4\u56fd\u5362\u5e03
rur=\u4fc4\u56fd\u5362\u5e03 (1991-1998)
rwf=\u5362\u65fa\u8fbe\u6cd5\u90ce
@@ -189,7 +217,7 @@
sdd=\u82cf\u4e39\u7b2c\u7eb3\u5c14
sek=\u745e\u5178\u514b\u6717
sgd=\u65b0\u52a0\u5761\u5143
-shp=\u5723\u8d6b\u52d2\u62ff\u9551
+shp=\u5723\u8d6b\u52d2\u62ff\u7fa4\u5c9b\u78c5
sit=\u65af\u6d1b\u6587\u5c3c\u4e9a\u6258\u62c9\u5c14
skk=\u65af\u6d1b\u4f10\u514b\u514b\u6717
sll=\u585e\u62c9\u5229\u6602\u5229\u6602
@@ -209,7 +237,7 @@
trl=\u571f\u8033\u5176\u91cc\u62c9
try=\u65b0\u571f\u8033\u5176\u91cc\u62c9
ttd=\u7279\u7acb\u5c3c\u8fbe\u548c\u591a\u5df4\u54e5\u5143
-twd=\u65b0\u53f0\u5e01\u5143
+twd=\u65b0\u53f0\u5e01
tzs=\u5766\u6851\u5c3c\u4e9a\u5148\u4ee4
uah=\u4e4c\u514b\u5170\u683c\u91cc\u592b\u5c3c\u4e9a
ugx=\u4e4c\u5e72\u8fbe\u5148\u4ee4
@@ -219,6 +247,7 @@
uyu=\u4e4c\u62c9\u572d\u6bd4\u7d22
uzs=\u4e4c\u5179\u522b\u514b\u65af\u82cf\u59c6
veb=\u59d4\u5185\u745e\u62c9\u535a\u5229\u74e6
+vef=\u59d4\u5185\u745e\u62c9\u5f3a\u52bf\u73bb\u5229\u74e6
vnd=\u8d8a\u5357\u76fe
vuv=\u74e6\u52aa\u963f\u56fe\u74e6\u56fe
wst=\u897f\u8428\u6469\u4e9a\u5854\u62c9
@@ -238,7 +267,7 @@
xpf=\u592a\u5e73\u6d0b\u6cd5\u90ce
xpt=\u94c2
xts=\u4e3a\u6d4b\u8bd5\u4fdd\u7559\u7684\u4ee3\u7801
-xxx=\u6ca1\u6709\u8d27\u5e01\u7684\u4ea4\u6613
+xxx=\u8d27\u5e01\u672a\u77e5\u6216\u65e0\u6548
yer=\u4e5f\u95e8\u91cc\u4e9a\u5c14
yum=\u5357\u65af\u62c9\u592b\u504c\u5a01\u7b2c\u7eb3\u5c14
zar=\u5357\u975e\u5170\u7279
--- a/jdk/src/share/classes/sun/util/resources/CurrencyNames_zh_TW.properties Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/src/share/classes/sun/util/resources/CurrencyNames_zh_TW.properties Mon Apr 11 16:19:20 2011 -0700
@@ -1,60 +1,84 @@
#
-# Copyright (c) 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
#
#
# COPYRIGHT AND PERMISSION NOTICE
#
-# Copyright (C) 1991-2007 Unicode, Inc. All rights reserved.
+# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved.
# Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of the Unicode data files and any associated documentation (the "Data
-# Files") or Unicode software and any associated documentation (the
-# "Software") to deal in the Data Files or Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, and/or sell copies of the Data Files or Software, and
-# to permit persons to whom the Data Files or Software are furnished to do
-# so, provided that (a) the above copyright notice(s) and this permission
-# notice appear with all copies of the Data Files or Software, (b) both the
-# above copyright notice(s) and this permission notice appear in associated
-# documentation, and (c) there is clear notice in each modified Data File or
-# in the Software as well as in the documentation associated with the Data
-# File(s) or Software that the data or software has been modified.
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of the Unicode data files and any associated documentation (the
+# "Data Files") or Unicode software and any associated documentation
+# (the "Software") to deal in the Data Files or Software without
+# restriction, including without limitation the rights to use, copy,
+# modify, merge, publish, distribute, and/or sell copies of the Data
+# Files or Software, and to permit persons to whom the Data Files or
+# Software are furnished to do so, provided that (a) the above copyright
+# notice(s) and this permission notice appear with all copies of the
+# Data Files or Software, (b) both the above copyright notice(s) and
+# this permission notice appear in associated documentation, and (c)
+# there is clear notice in each modified Data File or in the Software as
+# well as in the documentation associated with the Data File(s) or
+# Software that the data or software has been modified.
#
-# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
-# THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
-# INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
-# CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-# USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+# ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR
+# ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR
+# SOFTWARE.
#
-# Except as contained in this notice, the name of a copyright holder shall not
-# be used in advertising or otherwise to promote the sale, use or other
-# dealings in these Data Files or Software without prior written
-# authorization of the copyright holder.
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in these Data Files or Software without prior
+# written authorization of the copyright holder.
+
#
-
# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
-
+#
TWD=NT$
twd=\u65b0\u81fa\u5e63
adp=\u5b89\u9053\u723e\u966a\u58eb\u7279
aed=\u963f\u62c9\u4f2f\u806f\u5408\u5927\u516c\u570b\u8fea\u723e\u6c57
-afa=\u975e\u9583\u65cf\u53ca\u975e\u4e9e\u8a9e\u8a00
+afa=\u963f\u5bcc\u6c57\u5c3c (1927-2002)
afn=\u963f\u5bcc\u6c57\u5c3c
all=\u963f\u723e\u5df4\u5c3c\u4e9e\u5217\u514b
amd=\u4e9e\u7f8e\u5c3c\u4e9e\u5fb7\u62c9\u59c6
-ang=\u8377\u862d \u5b89\u68af\u862d \u76fe
+ang=\u53e4\u82f1\u6587
aoa=\u5b89\u54e5\u62c9\u5bec\u624e
ars=\u963f\u6839\u5ef7\u62ab\u7d22
ats=\u5967\u5730\u5229\u5148\u4ee4
aud=\u6fb3\u5e63
awg=\u963f\u9b6f\u5df4\u76fe
-azm=\u963f\u585e\u62dc\u5f4a\u99ac\u7279\u7d0d
+azm=\u4e9e\u585e\u62dc\u7136\u99ac\u7d0d\u7279 (1993-2006)
+azn=\u4e9e\u585e\u62dc\u7136\u99ac\u7d0d\u7279
bam=\u6ce2\u58eb\u5c3c\u4e9e-\u9ed1\u585e\u54e5\u7dad\u90a3\u53ef\u8f49\u63db\u99ac\u514b
bbd=\u5df4\u8c9d\u591a\u5143
bdt=\u5b5f\u52a0\u62c9\u5854\u5361
@@ -66,14 +90,14 @@
bmd=\u767e\u6155\u9054\u5e63
bnd=\u6c76\u840a\u5143
bob=\u73bb\u5229\u7dad\u4e9e\u8ca8\u5e63\u55ae\u4f4d
-bov=\u73bb\u5229\u7dad\u4e9e \u5e55\u591a
+bov=\u73bb\u5229\u7dad\u4e9e\u5e55\u591a
brl=\u5df4\u897f\u91cc\u62c9
bsd=\u5df4\u54c8\u99ac\u5143
btn=\u4e0d\u4e39\u52aa\u624e\u59c6
-bwp=\u6ce2\u672d\u90a3 - \u666e\u62c9
+bwp=\u6ce2\u672d\u90a3\u666e\u62c9
byb=\u767d\u4fc4\u7f85\u65af\u65b0\u76e7\u5e03 (1994-1999)
byr=\u767d\u4fc4\u7f85\u65af\u76e7\u5e03
-bzd=\u4f2f\u5229\u8332\u5143
+bzd=\u8c9d\u91cc\u65af\u5143
cad=\u52a0\u5e63
cdf=\u525b\u679c\u6cd5\u90ce
chf=\u745e\u58eb\u6cd5\u90ce
@@ -82,9 +106,10 @@
cny=\u4eba\u6c11\u5e63
cop=\u54e5\u502b\u6bd4\u4e9e\u62ab\u7d22
crc=\u54e5\u65af\u5927\u9ece\u52a0\u79d1\u90ce
+csd=\u65e7\u585e\u5c14\u7ef4\u4e9a\u7b2c\u7eb3\u5c14
cup=\u53e4\u5df4\u62ab\u7d22
cve=\u7dad\u5fb7\u89d2\u57c3\u65af\u5eab\u591a
-cyp=\u8cfd\u6d66\u8def\u65af\u938a
+cyp=\u8cfd\u666e\u52d2\u65af\u938a
czk=\u6377\u514b\u514b\u6717
dem=\u5fb7\u570b\u99ac\u514b
djf=\u5409\u5e03\u5730\u6cd5\u90ce
@@ -103,23 +128,24 @@
frf=\u6cd5\u570b\u6cd5\u90ce
gbp=\u82f1\u938a
gel=\u55ac\u6cbb\u62c9\u91cc
-ghc=\u8fe6\u7d0d\u4ed9\u8515
+ghc=\u8fe6\u7d0d\u4ed9\u8515 (1979-2007)
+ghs=\u8fe6\u7d0d\u4ed9\u8515
gip=\u76f4\u5e03\u7f85\u9640\u938a
gmd=\u7518\u6bd4\u4e9e\u9054\u62c9\u897f
gnf=\u5e7e\u5167\u4e9e\u6cd5\u90ce
grd=\u5e0c\u81d8\u5fb7\u62c9\u514b\u99ac
gtq=\u74dc\u5730\u99ac\u62c9\u683c\u67e5\u723e
-gwp=\u5e7e\u5167\u4e9e\u62ab\u7d22\u62ab\u7d22
+gwp=\u5e7e\u5167\u4e9e\u6bd4\u7d22\u62ab\u7d22
gyd=\u572d\u4e9e\u90a3\u5143
hkd=\u6e2f\u5143
hnl=\u6d2a\u90fd\u62c9\u65af\u502b\u76ae\u62c9
hrk=\u514b\u7f85\u5730\u4e9e\u5eab\u7d0d
htg=\u6d77\u5730\u53e4\u5fb7
-huf=\u5308\u7259\u5229 - \u798f\u6797
-idr=\u5370\u5c3c - \u76e7\u5e03
+huf=\u5308\u7259\u5229\u798f\u6797
+idr=\u5370\u5c3c\u76fe
iep=\u611b\u723e\u862d\u938a
ils=\u4ee5\u8272\u5217\u65b0\u8b1d\u514b\u723e
-inr=\u5370\u5ea6\u76e7\u5e03
+inr=\u5370\u5ea6\u76e7\u6bd4
iqd=\u4f0a\u62c9\u514b\u7b2c\u7d0d\u723e
irr=\u4f0a\u6717\u91cc\u4e9e\u723e
isk=\u51b0\u5cf6\u514b\u6717
@@ -131,12 +157,12 @@
kgs=\u5409\u723e\u5409\u65af\u7d22\u99ac
khr=\u67ec\u57d4\u5be8\u745e\u723e
kmf=\u79d1\u6469\u7f85\u6cd5\u90ce
-kpw=\u5317\u671d\u9bae\u5e63
-krw=\u97d3\u570b\u571c
+kpw=\u5317\u97d3\u571c
+krw=\u97d3\u571c
kwd=\u79d1\u5a01\u7279\u7b2c\u7d0d\u723e
kyd=\u958b\u66fc\u7fa4\u5cf6\u7f8e\u5143
kzt=\u5361\u624e\u514b\u65af\u5766\u5766\u5409
-lak=\u8001\u64be \u958b\u666e
+lak=\u8001\u631d\u57fa\u666e
lbp=\u9ece\u5df4\u5ae9\u938a
lkr=\u65af\u91cc\u862d\u5361\u76e7\u5e03
lrd=\u8cf4\u6bd4\u745e\u4e9e\u5143
@@ -145,7 +171,7 @@
luf=\u76e7\u68ee\u5821\u6cd5\u90ce
lvl=\u62c9\u812b\u7dad\u4e9e\u62c9\u7279\u9280\u5e63
lyd=\u5229\u6bd4\u4e9e\u7b2c\u7d0d\u723e
-mad=\u99ac\u90fd\u62c9\u6587
+mad=\u6469\u6d1b\u54e5\u8fea\u62c9\u59c6
mdl=\u6469\u675c\u96f2\u5217\u4f0a
mga=\u99ac\u9054\u52a0\u65af\u52a0\u827e\u745e\u723e
mgf=\u99ac\u9054\u52a0\u65af\u52a0\u6cd5\u90ce
@@ -158,13 +184,14 @@
mur=\u6a21\u91cc\u897f\u65af\u76e7\u5e03
mvr=\u99ac\u723e\u5730\u592b\u6d77\u5cf6\u76e7\u975e\u4e9e
mwk=\u99ac\u62c9\u7dad\u514b\u74e6\u67e5
-mxn=\u58a8\u897f\u54e5 - \u62ab\u7d22
-mxv=\u58a8\u897f\u54e5\u6cd5\u5f8b\u53cd\u8f49(UDI)
-myr=\u99ac\u4f86\u897f\u4e9e - \u6797\u5409\u7279
+mxn=\u58a8\u897f\u54e5\u62ab\u7d22
+mxv=\u58a8\u897f\u54e5 Unidad de Inversion (UDI)\uff08\u8d44\u91d1\uff09
+myr=\u99ac\u4f86\u897f\u4e9e\u4ee4\u5409
mzm=\u83ab\u4e09\u6bd4\u514b\u6885\u8482\u5361\u723e
+mzn=\u83ab\u4e09\u6bd4\u514b\u7f8e\u63d0\u5361
nad=\u7d0d\u7c73\u6bd4\u4e9e\u5143
ngn=\u5948\u53ca\u5229\u4e9e\u5948\u62c9
-nio=\u5c3c\u52a0\u62c9\u74dc \u91d1\u54e5\u591a\u83ef
+nio=\u5c3c\u52a0\u62c9\u74dc\u91d1\u79d1\u591a\u5df4
nlg=\u8377\u862d\u76fe
nok=\u632a\u5a01\u514b\u7f85\u7d0d
npr=\u5c3c\u6cca\u723e\u76e7\u5e03
@@ -179,60 +206,70 @@
pte=\u8461\u8404\u7259\u57c3\u65af\u5eab\u591a
pyg=\u5df4\u62c9\u572d\u74dc\u62c9\u5c3c
qar=\u5361\u9054\u723e\u91cc\u4e9e\u723e
-rol=\u7f85\u99ac\u5c3c\u4e9e\u5217\u4f0a
+rol=\u65e7\u7f57\u9a6c\u5c3c\u4e9a\u5217\u4f0a
+ron=\u7f85\u99ac\u5c3c\u4e9e\u5217\u4f0a
+rsd=\u585e\u723e\u7dad\u4e9e\u6234\u7d0d
rub=\u4fc4\u7f85\u65af\u76e7\u5e03
rur=\u4fc4\u7f85\u65af\u76e7\u5e03 (1991-1998)
rwf=\u76e7\u5b89\u9054\u6cd5\u90ce
sar=\u6c99\u70cf\u5730\u91cc\u96c5
sbd=\u7d22\u7f85\u9580\u7fa4\u5cf6\u5143
-scr=\u585e\u820c\u723e\u7fa4\u5cf6\u76e7\u5e03
+scr=\u585e\u5e2d\u723e\u76e7\u6bd4
sdd=\u8607\u4e39\u7b2c\u7d0d\u723e
+sdg=\u8607\u4e39\u938a
sek=\u745e\u5178\u514b\u7f85\u7d0d
sgd=\u65b0\u52a0\u5761\u5e63
-shp=\u8056\u8d6b\u52d2\u62ff \u938a
+shp=\u5723\u8d6b\u52d2\u62ff\u7fa4\u5c9b\u78c5
sit=\u65af\u6d1b\u7dad\u5c3c\u4e9e\u6258\u52d2
skk=\u65af\u6d1b\u4f10\u514b\u514b\u6717
sll=\u7345\u5b50\u5c71\u5229\u6602
sos=\u7d22\u99ac\u5229\u4e9e\u5148\u4ee4
-srg=\u8607\u91cc\u5357\u76fe
+srd=\u82cf\u91cc\u5357\u5143
+srg=\u8607\u5229\u5357\u57fa\u723e
std=\u8056\u591a\u7f8e\u5cf6\u548c\u666e\u6797\u897f\u6bd4\u5cf6\u591a\u5e03\u62c9
-svc=\u611b\u723e \u85a9\u723e\u74e6\u591a\u79d1\u90ce
+svc=\u8428\u5c14\u74e6\u591a\u79d1\u6717
syp=\u6558\u5229\u4e9e\u938a
-szl=\u65af\u5a01\u58eb\u862d \u91cc\u90ce
+szl=\u65af\u5a01\u58eb\u5170\u91cc\u5170\u5409\u5c3c
thb=\u6cf0\u9296
-tjs=\u5854\u5409\u514b\u65af\u5766 \u7d22\u83ab\u5c3c
+tjs=\u5854\u5409\u514b\u65af\u5766\u7d22\u83ab\u5c3c
tmm=\u571f\u5eab\u66fc\u99ac\u7d0d\u7279
tnd=\u7a81\u5c3c\u897f\u4e9e\u7b2c\u7d0d\u723e
top=\u6771\u52a0\u6f58\u52a0
-tpe=\u5e1d\u6c76 \u57c3\u65af\u5eab\u591a
+tpe=\u5e1d\u6c76\u57c3\u65af\u5e93\u591a
trl=\u571f\u8033\u5176\u91cc\u62c9
try=\u65b0\u571f\u8033\u5176\u91cc\u62c9
-ttd=\u5343\u91cc\u9054\u53ca\u6258\u5df4\u54e5r
-tzs=\u5766\u6851\u5c3c\u4e9e \u5148\u4ee4
+ttd=\u7279\u7acb\u5c3c\u8fbe\u548c\u591a\u5df4\u54e5\u5143
+tzs=\u5766\u6851\u5c3c\u4e9a\u5148\u4ee4
uah=\u70cf\u514b\u862d\u683c\u91cc\u592b\u90a3
ugx=\u70cf\u5e72\u9054\u5148\u4ee4
usd=\u7f8e\u5143
usn=\u7f8e\u5143 (\u7b2c\u4e8c\u5929)
uss=\u7f8e\u5143 (\u540c\u4e00\u5929)
uyu=\u70cf\u62c9\u572d\u62ab\u7d22
-uzs=\u70cf\u8332\u5225\u514b\u65af\u5766 \u85a9\u6728
-veb=\u59d4\u5167\u745e\u62c9\u535a\u5229\u74e6
+uzs=\u70cf\u8332\u5225\u514b\u7d22\u59c6
+veb=\u59d4\u5167\u745e\u62c9\u73bb\u5229\u74e6
+vef=\u59d4\u5167\u745e\u62c9\u5f37\u52e2\u73bb\u5229\u74e6
vnd=\u8d8a\u5357\u76fe
vuv=\u842c\u90a3\u675c\u842c\u675c
wst=\u897f\u85a9\u6469\u4e9e\u5854\u62c9
-xaf=\u897f\u975e \u6cd5\u90ce BEAC
+xaf=\u897f\u975e\u6cd5\u90ce BEAC
+xag=XAG
xau=\u9ec3\u91d1
xba=\u6b50\u6d32\u7d9c\u5408\u55ae\u4f4d
xbb=\u6b50\u6d32\u8ca8\u5e63\u55ae\u4f4d XBB
-xbc=\u6b50\u6d32\u6703\u8a08\u55ae\u4f4d(XBC)
-xbd=\u6b50\u6d32\u6703\u8a08\u55ae\u4f4d(XBD)
+xbc=\u6b50\u6d32\u6703\u8a08\u55ae\u4f4d (XBC)
+xbd=\u6b50\u6d32\u6703\u8a08\u55ae\u4f4d (XBD)
xcd=\u683c\u745e\u90a3\u9054\u5143
xdr=\u7279\u6b8a\u63d0\u6b3e\u6b0a
xfo=\u6cd5\u570b\u91d1\u6cd5\u90ce
xfu=\u6cd5\u570b UIC \u6cd5\u90ce
-xof=\u897f\u975e \u6cd5\u90ce BCEAO
+xof=\u897f\u975e\u6cd5\u90ce BCEAO
+xpd=\u94af
xpf=CFP \u6cd5\u90ce
-yer=\u4e5f\u9580\u91cc\u4e9e\u723e
+xpt=\u94c2
+xts=XTS
+xxx=XXX
+yer=\u8449\u9580\u91cc\u96c5
yum=\u5357\u65af\u62c9\u592b\u632a\u5a01\u4e9e\u7b2c\u7d0d\u723e
zar=\u5357\u975e\u862d\u7279
zmk=\u5c1a\u6bd4\u4e9e\u514b\u74e6\u67e5
--- a/jdk/test/sun/text/resources/LocaleData Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/test/sun/text/resources/LocaleData Mon Apr 11 16:19:20 2011 -0700
@@ -6446,3 +6446,499 @@
CurrencyNames//xxx=Unknown Currency
CurrencyNames//yum=Yugoslavian New Dinar (1994-2002)
CurrencyNames//zwd=Zimbabwean Dollar (1980-2008)
+
+# bug 7020583
+CurrencyNames/de/azm=Aserbaidschan-Manat (1993-2006)
+CurrencyNames/de/azn=Aserbaidschan-Manat
+CurrencyNames/de/csd=Alter Serbischer Dinar
+CurrencyNames/de/cyp=Zypern-Pfund
+CurrencyNames/de/esp=Spanische Peseta
+CurrencyNames/de/fjd=Fidschi-Dollar
+CurrencyNames/de/fkp=Falkland-Pfund
+CurrencyNames/de/ghs=Ghanaische Cedi
+CurrencyNames/de/gip=Gibraltar-Pfund
+CurrencyNames/de/gnf=Guinea-Franc
+CurrencyNames/de/gyd=Guyana-Dollar
+CurrencyNames/de/hkd=Hongkong-Dollar
+CurrencyNames/de/itl=Italienische Lira
+CurrencyNames/de/jmd=Jamaika-Dollar
+CurrencyNames/de/kes=Kenia-Schilling
+CurrencyNames/de/mgf=Madagaskar-Franc
+CurrencyNames/de/mur=Mauritius-Rupie
+CurrencyNames/de/mzm=Alter Metical
+CurrencyNames/de/mzn=Metical
+CurrencyNames/de/nad=Namibia-Dollar
+CurrencyNames/de/nzd=Neuseeland-Dollar
+CurrencyNames/de/ron=Rum\u00e4nischer Leu
+CurrencyNames/de/rsd=Serbischer Dinar
+CurrencyNames/de/rwf=Ruanda-Franc
+CurrencyNames/de/sbd=Salomonen-Dollar
+CurrencyNames/de/scr=Seychellen-Rupie
+CurrencyNames/de/sdg=Sudanesisches Pfund
+CurrencyNames/de/sgd=Singapur-Dollar
+CurrencyNames/de/sos=Somalia-Schilling
+CurrencyNames/de/srd=Surinamischer Dollar
+CurrencyNames/de/tpe=Timor-Escudo
+CurrencyNames/de/trl=Alte T\u00fcrkische Lira
+CurrencyNames/de/try=T\u00fcrkische Lira
+CurrencyNames/de/ttd=Trinidad- und Tobago-Dollar
+CurrencyNames/de/twd=Neuer Taiwan-Dollar
+CurrencyNames/de/tzs=Tansania-Schilling
+CurrencyNames/de/ugx=Uganda-Schilling
+CurrencyNames/de/usd=US-Dollar
+CurrencyNames/de/vef=Bol\u00edvar Fuerte
+CurrencyNames/de/xag=Unze Silber
+CurrencyNames/de/xau=Unze Gold
+CurrencyNames/de/xbb=Europ\u00e4ische W\u00e4hrungseinheit (XBB)
+CurrencyNames/de/xpd=Unze Palladium
+CurrencyNames/de/xpt=Unze Platin
+CurrencyNames/de/xts=Testw\u00e4hrung
+CurrencyNames/de/xxx=Unbekannte W\u00e4hrung
+CurrencyNames/de/yer=Jemen-Rial
+CurrencyNames/de/zar=S\u00fcdafrikanischer Rand
+CurrencyNames/de/zwd=Simbabwe-Dollar
+
+CurrencyNames/es/aed=d\u00edrham de los Emiratos \u00c1rabes Unidos
+CurrencyNames/es/azm=manat azer\u00ed (1993-2006)
+CurrencyNames/es/azn=manat azer\u00ed
+CurrencyNames/es/csd=antiguo dinar serbio
+CurrencyNames/es/ghc=cedi ghan\u00e9s (1979-2007)
+CurrencyNames/es/ghs=cedi ghan\u00e9s
+CurrencyNames/es/mzm=antiguo metical mozambique\u00f1o
+CurrencyNames/es/mzn=metical mozambique\u00f1o
+CurrencyNames/es/rsd=dinar serbio
+CurrencyNames/es/sdg=libra sudanesa
+CurrencyNames/es/trl=lira turca antigua
+CurrencyNames/es/vef=bol\u00edvar fuerte venezolano
+
+CurrencyNames/fr/afa=afghani (1927\u20132002)
+CurrencyNames/fr/all=lek albanais
+CurrencyNames/fr/ang=florin antillais
+CurrencyNames/fr/awg=florin arubais
+CurrencyNames/fr/azm=manat az\u00e9ri (1993-2006)
+CurrencyNames/fr/azn=manat az\u00e9ri
+CurrencyNames/fr/bam=mark convertible bosniaque
+CurrencyNames/fr/bbd=dollar barbadien
+CurrencyNames/fr/bdt=taka bangladeshi
+CurrencyNames/fr/bgl=lev bulgare (1962\u20131999)
+CurrencyNames/fr/bgn=nouveau lev bulgare
+CurrencyNames/fr/bhd=dinar bahre\u00efni
+CurrencyNames/fr/bif=franc burundais
+CurrencyNames/fr/bmd=dollar bermudien
+CurrencyNames/fr/bnd=dollar brun\u00e9ien
+CurrencyNames/fr/bov=mvdol bolivien
+CurrencyNames/fr/brl=r\u00e9al br\u00e9silien
+CurrencyNames/fr/bsd=dollar baham\u00e9en
+CurrencyNames/fr/btn=ngultrum bouthanais
+CurrencyNames/fr/bwp=pula botswanais
+CurrencyNames/fr/bzd=dollar b\u00e9liz\u00e9en
+CurrencyNames/fr/cny=yuan renminbi chinois
+CurrencyNames/fr/crc=col\u00f3n costaricain
+CurrencyNames/fr/csd=dinar serbo-mont\u00e9n\u00e9grin
+CurrencyNames/fr/cve=escudo capverdien
+CurrencyNames/fr/cyp=livre chypriote
+CurrencyNames/fr/dem=mark allemand
+CurrencyNames/fr/djf=franc djiboutien
+CurrencyNames/fr/ern=nafka \u00e9rythr\u00e9en
+CurrencyNames/fr/etb=birr \u00e9thiopien
+CurrencyNames/fr/fjd=dollar fidjien
+CurrencyNames/fr/fkp=livre des Falkland
+CurrencyNames/fr/gel=lari g\u00e9orgien
+CurrencyNames/fr/ghs=c\u00e9di ghan\u00e9en
+CurrencyNames/fr/gmd=dalasi gambien
+CurrencyNames/fr/grd=drachme grecque
+CurrencyNames/fr/gtq=quetzal guat\u00e9malt\u00e8que
+CurrencyNames/fr/gwp=peso bissau-guin\u00e9en
+CurrencyNames/fr/hnl=lempira hondurien
+CurrencyNames/fr/hrk=kuna croate
+CurrencyNames/fr/htg=gourde ha\u00eftienne
+CurrencyNames/fr/huf=forint hongrois
+CurrencyNames/fr/idr=roupie indon\u00e9sienne
+CurrencyNames/fr/ils=nouveau shekel isra\u00e9lien
+CurrencyNames/fr/iqd=dinar irakien
+CurrencyNames/fr/jpy=yen japonais
+CurrencyNames/fr/kes=shilling k\u00e9nyan
+CurrencyNames/fr/kgs=som kirghize
+CurrencyNames/fr/khr=riel cambodgien
+CurrencyNames/fr/kmf=franc comorien
+CurrencyNames/fr/kwd=dinar kowe\u00eftien
+CurrencyNames/fr/kzt=tenge kazakh
+CurrencyNames/fr/lak=kip loatien
+CurrencyNames/fr/lkr=roupie srilankaise
+CurrencyNames/fr/lsl=loti lesothan
+CurrencyNames/fr/mga=ariary malgache
+CurrencyNames/fr/mkd=denar mac\u00e9donien
+CurrencyNames/fr/mmk=kyat myanmarais
+CurrencyNames/fr/mnt=tugrik mongol
+CurrencyNames/fr/mop=pataca macanaise
+CurrencyNames/fr/mro=ouguiya mauritanien
+CurrencyNames/fr/mvr=rufiyaa maldivienne
+CurrencyNames/fr/mwk=kwacha malawite
+CurrencyNames/fr/myr=ringgit malais
+CurrencyNames/fr/mzn=metical mozambicain
+CurrencyNames/fr/ngn=naira nig\u00e9rian
+CurrencyNames/fr/nio=c\u00f3rdoba oro nicaraguayen
+CurrencyNames/fr/npr=roupie n\u00e9palaise
+CurrencyNames/fr/pab=balboa panam\u00e9en
+CurrencyNames/fr/pgk=kina papouan-n\u00e9o-guin\u00e9en
+CurrencyNames/fr/pkr=roupie pakistanaise
+CurrencyNames/fr/pln=zloty polonais
+CurrencyNames/fr/pyg=guaran\u00ed paraguayen
+CurrencyNames/fr/qar=rial qatari
+CurrencyNames/fr/ron=leu roumain
+CurrencyNames/fr/rsd=dinar serbe
+CurrencyNames/fr/rub=rouble russe
+CurrencyNames/fr/rur=rouble russe (1991\u20131998)
+CurrencyNames/fr/sbd=dollar des \u00eeles Salomon
+CurrencyNames/fr/sdg=livre soudanaise
+CurrencyNames/fr/sit=tolar slov\u00e8ne
+CurrencyNames/fr/sll=leone sierra-l\u00e9onais
+CurrencyNames/fr/sos=shilling somalien
+CurrencyNames/fr/srg=florin surinamais
+CurrencyNames/fr/std=dobra santom\u00e9en
+CurrencyNames/fr/svc=col\u00f3n salvadorien
+CurrencyNames/fr/szl=lilangeni swazi
+CurrencyNames/fr/thb=baht tha\u00eflandais
+CurrencyNames/fr/tjs=somoni tadjik
+CurrencyNames/fr/tmm=manat turkm\u00e8ne
+CurrencyNames/fr/top=pa\u2019anga tongan
+CurrencyNames/fr/tpe=escudo timorais
+CurrencyNames/fr/ttd=dollar trinidadien
+CurrencyNames/fr/twd=nouveau dollar ta\u00efwanais
+CurrencyNames/fr/tzs=shilling tanzanien
+CurrencyNames/fr/uah=hryvnia ukrainienne
+CurrencyNames/fr/uzs=sum ouzbek
+CurrencyNames/fr/vef=bolivar fuerte v\u00e9n\u00e9zu\u00e9lien
+CurrencyNames/fr/vnd=d\u00f4ng vietnamien
+CurrencyNames/fr/vuv=vatu vanuatuan
+CurrencyNames/fr/wst=tala samoan
+CurrencyNames/fr/xts=(devise de test)
+CurrencyNames/fr/xxx=devise inconnue ou non valide
+CurrencyNames/fr/yer=rial y\u00e9m\u00e9nite
+CurrencyNames/fr/zar=rand sud-africain
+CurrencyNames/fr/zmk=kwacha zambien
+CurrencyNames/fr/zwd=dollar zimbabw\u00e9en
+
+CurrencyNames/it/azm=Manat Azero (1993-2006)
+CurrencyNames/it/ghs=Cedi ghanese
+CurrencyNames/it/iep=Sterlina irlandese
+CurrencyNames/it/mzn=Metical del Mozambico
+CurrencyNames/it/rsd=Dinaro serbo
+CurrencyNames/it/sdg=Sterlina sudanese
+CurrencyNames/it/srd=Dollaro surinamese
+CurrencyNames/it/vef=Bol\u00edvar venezuelano forte
+CurrencyNames/it/xag=Argento
+CurrencyNames/it/xpd=Palladio
+
+CurrencyNames/ja/azm=\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3 \u30de\u30ca\u30c8 (1993-2006)
+CurrencyNames/ja/azn=\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3 \u30de\u30ca\u30c8
+CurrencyNames/ja/ghc=\u30ac\u30fc\u30ca \u30bb\u30c7\u30a3 (1979-2007)
+CurrencyNames/ja/ghs=\u30ac\u30fc\u30ca \u30bb\u30c7\u30a3
+CurrencyNames/ja/mzn=\u30e2\u30b6\u30f3\u30d3\u30fc\u30af \u30e1\u30c6\u30a3\u30ab\u30eb
+CurrencyNames/ja/rol=\u30eb\u30fc\u30de\u30cb\u30a2 \u65e7\u30ec\u30a4
+CurrencyNames/ja/ron=\u30eb\u30fc\u30de\u30cb\u30a2 \u30ec\u30a4
+CurrencyNames/ja/rsd=\u30c7\u30a3\u30ca\u30fc\u30eb (\u30bb\u30eb\u30d3\u30a2)
+CurrencyNames/ja/sdg=\u30b9\u30fc\u30c0\u30f3 \u30dd\u30f3\u30c9
+CurrencyNames/ja/srd=\u30b9\u30ea\u30ca\u30e0 \u30c9\u30eb
+CurrencyNames/ja/vef=\u30d9\u30cd\u30ba\u30a8\u30e9 \u30dc\u30ea\u30d0\u30eb\u30d5\u30a8\u30eb\u30c6
+CurrencyNames/ja/xag=\u9280
+CurrencyNames/ja/xpd=\u30d1\u30e9\u30b8\u30a6\u30e0
+CurrencyNames/ja/xpt=\u30d7\u30e9\u30c1\u30ca
+CurrencyNames/ja/xts=\u30c6\u30b9\u30c8\u7528\u901a\u8ca8\u30b3\u30fc\u30c9
+CurrencyNames/ja/xxx=\u4e0d\u660e\u307e\u305f\u306f\u7121\u52b9\u306a\u901a\u8ca8
+CurrencyNames/ja/zmk=\u30b6\u30f3\u30d3\u30a2 \u30af\u30ef\u30c1\u30e3
+
+CurrencyNames/ko/aed=\uc544\ub78d\uc5d0\ubbf8\ub9ac\ud2b8 \ub514\ub974\ud568
+CurrencyNames/ko/ang=\ub124\ub35c\ub780\ub4dc\ub839 \uc548\ud2f8\ub808\uc2a4 \uae38\ub354
+CurrencyNames/ko/azm=\uc544\uc81c\ub974\ubc14\uc774\uc820 \ub9c8\ub098\ud2b8(1993-2006)
+CurrencyNames/ko/azn=\uc544\uc81c\ub974\ubc14\uc774\uc794 \ub9c8\ub098\ud2b8
+CurrencyNames/ko/bov=\ubcfc\ub9ac\ube44\uc544\ub178 Mvdol(\uae30\uae08)
+CurrencyNames/ko/chf=\uc2a4\uc704\uc2a4 \ud504\ub791
+CurrencyNames/ko/clf=\uce60\ub808 UF (Unidades de Fomento)
+CurrencyNames/ko/csd=\uace0 \uc138\ub974\ube44\uc544 \ub514\ub098\ub974
+CurrencyNames/ko/ghc=\uac00\ub098 \uc2dc\ub514 (1979-2007)
+CurrencyNames/ko/ghs=\uac00\ub098 \uc2dc\ub514
+CurrencyNames/ko/mxv=\uba55\uc2dc\ucf54 UDI(Unidad de Inversion)
+CurrencyNames/ko/myr=\ub9d0\ub808\uc774\uc2dc\uc544 \ub9c1\uae43
+CurrencyNames/ko/mzm=\uace0 \ubaa8\uc7a0\ube44\ud06c \uba54\ud2f0\uce7c
+CurrencyNames/ko/mzn=\ubaa8\uc7a0\ube44\ud06c \uba54\ud2f0\uce7c
+CurrencyNames/ko/ron=\ub8e8\ub9c8\ub2c8\uc544 \ub808\uc6b0
+CurrencyNames/ko/rsd=\uc138\ub974\ube44\uc544 \ub514\ub098\ub974
+CurrencyNames/ko/sdg=\uc218\ub2e8 \ud30c\uc6b4\ub4dc
+CurrencyNames/ko/srd=\uc218\ub9ac\ub0a8 \ub2ec\ub7ec
+CurrencyNames/ko/top=\ud1b5\uac00 \ud30c\uc559\uac00
+CurrencyNames/ko/trl=\ud130\ud0a4 \ub9ac\ub77c
+CurrencyNames/ko/try=\uc2e0 \ud130\ud0a4 \ub9ac\ub77c
+CurrencyNames/ko/usn=\ubbf8\uad6d \ub2ec\ub7ec(\ub2e4\uc74c\ub0a0)
+CurrencyNames/ko/uss=\ubbf8\uad6d \ub2ec\ub7ec(\ub2f9\uc77c)
+CurrencyNames/ko/vef=\ubca0\ub124\uc8fc\uc5d8\ub77c \ubcfc\ub9ac\ubc14\ub974 \ud478\uc5d0\ub974\ub5bc
+CurrencyNames/ko/xaf=CFA \ud504\ub791 BEAC
+CurrencyNames/ko/xag=\uc740\ud654
+CurrencyNames/ko/xba=\uc720\ub974\ucf54 (\uc720\ub7fd \ud68c\uacc4 \ub2e8\uc704)
+CurrencyNames/ko/xbb=\uc720\ub7fd \ud1b5\ud654 \ub3d9\ub9f9
+CurrencyNames/ko/xbc=\uc720\ub7fd \uacc4\uc0b0 \ub2e8\uc704 (XBC)
+CurrencyNames/ko/xbd=\uc720\ub7fd \uacc4\uc0b0 \ub2e8\uc704 (XBD)
+CurrencyNames/ko/xof=CFA \ud504\ub791 BCEAO
+CurrencyNames/ko/xpd=\ud314\ub77c\ub4d0
+CurrencyNames/ko/xpf=CFP \ud504\ub791
+CurrencyNames/ko/xpt=\ubc31\uae08
+CurrencyNames/ko/xts=\ud14c\uc2a4\ud2b8 \ud1b5\ud654 \ucf54\ub4dc
+CurrencyNames/ko/xxx=\uc54c\uc218\uc5c6\uac70\ub098 \uc720\ud6a8\ud558\uc9c0\uc54a\uc740 \ud1b5\ud654\ub2e8\uc704
+CurrencyNames/ko/zwd=\uc9d0\ubc14\ube0c\uc6e8 \ub2ec\ub7ec
+
+CurrencyNames/sv/adp=andorransk peseta
+CurrencyNames/sv/aed=F\u00f6renade Arabemiratens dirham
+CurrencyNames/sv/afa=afghani (1927-2002)
+CurrencyNames/sv/afn=afghani
+CurrencyNames/sv/all=albansk lek
+CurrencyNames/sv/amd=armenisk dram
+CurrencyNames/sv/ang=Nederl\u00e4ndska Antillernas gulden
+CurrencyNames/sv/aoa=angolansk kwanza
+CurrencyNames/sv/ars=argentinsk peso
+CurrencyNames/sv/ats=\u00f6sterrikisk schilling
+CurrencyNames/sv/aud=australisk dollar
+CurrencyNames/sv/awg=Aruba-gulden
+CurrencyNames/sv/azm=azerbajdzjansk manat (1993-2006)
+CurrencyNames/sv/azn=azerbajdzjansk manat
+CurrencyNames/sv/bam=bosnisk-hercegovinsk mark (konvertibel)
+CurrencyNames/sv/bbd=Barbados-dollar
+CurrencyNames/sv/bdt=bangladeshisk taka
+CurrencyNames/sv/bef=belgisk franc
+CurrencyNames/sv/bgn=bulgarisk ny lev
+CurrencyNames/sv/bhd=Bahrain-dinar
+CurrencyNames/sv/bif=burundisk franc
+CurrencyNames/sv/bnd=Brunei-dollar
+CurrencyNames/sv/bob=boliviano
+CurrencyNames/sv/bov=boliviansk mvdol
+CurrencyNames/sv/brl=brasiliansk real
+CurrencyNames/sv/bsd=Bahamas-dollar
+CurrencyNames/sv/btn=bhutanesisk ngultrum
+CurrencyNames/sv/bwp=botswansk pula
+CurrencyNames/sv/byb=vitrysk ny rubel (1994-1999)
+CurrencyNames/sv/byr=vitrysk rubel
+CurrencyNames/sv/bzd=belizisk dollar
+CurrencyNames/sv/cad=kanadensisk dollar
+CurrencyNames/sv/cdf=kongolesisk franc
+CurrencyNames/sv/chf=schweizisk franc
+CurrencyNames/sv/clf=chilensk unidad de fomento
+CurrencyNames/sv/clp=chilensk peso
+CurrencyNames/sv/cny=kinesisk yuan renminbi
+CurrencyNames/sv/cop=colombiansk peso
+CurrencyNames/sv/crc=costarikansk col\u00f3n
+CurrencyNames/sv/csd=jugoslavisk dinar
+CurrencyNames/sv/cup=kubansk peso
+CurrencyNames/sv/cve=kapverdisk escudo
+CurrencyNames/sv/cyp=cypriotiskt pund
+CurrencyNames/sv/czk=tjeckisk koruna
+CurrencyNames/sv/dem=tysk mark
+CurrencyNames/sv/djf=djiboutisk franc
+CurrencyNames/sv/dkk=dansk krona
+CurrencyNames/sv/dop=dominikansk peso
+CurrencyNames/sv/dzd=algerisk dinar
+CurrencyNames/sv/eek=estnisk krona
+CurrencyNames/sv/egp=egyptiskt pund
+CurrencyNames/sv/ern=eritreansk nakfa
+CurrencyNames/sv/esp=spansk peseta
+CurrencyNames/sv/etb=etiopisk birr
+CurrencyNames/sv/eur=euro
+CurrencyNames/sv/fim=finsk mark
+CurrencyNames/sv/fjd=Fiji-dollar
+CurrencyNames/sv/frf=fransk franc
+CurrencyNames/sv/gbp=brittiskt pund sterling
+CurrencyNames/sv/gel=georgisk lari
+CurrencyNames/sv/ghc=ghanansk cedi (1979-2007)
+CurrencyNames/sv/ghs=ghanansk cedi
+CurrencyNames/sv/gip=gibraltiskt pund
+CurrencyNames/sv/gmd=gambisk dalasi
+CurrencyNames/sv/gnf=guineansk franc
+CurrencyNames/sv/grd=grekisk drachma
+CurrencyNames/sv/gtq=guatemalansk quetzal
+CurrencyNames/sv/gyd=guyanansk dollar
+CurrencyNames/sv/hnl=honduransk lempira
+CurrencyNames/sv/hrk=kroatisk kuna
+CurrencyNames/sv/htg=haitisk gourde
+CurrencyNames/sv/huf=ungersk forint
+CurrencyNames/sv/idr=indonesisk rupiah
+CurrencyNames/sv/iep=irl\u00e4ndskt pund
+CurrencyNames/sv/ils=israelisk ny shekel
+CurrencyNames/sv/inr=indisk rupie
+CurrencyNames/sv/iqd=irakisk dinar
+CurrencyNames/sv/irr=iransk rial
+CurrencyNames/sv/isk=isl\u00e4ndsk krona
+CurrencyNames/sv/itl=italiensk lira
+CurrencyNames/sv/jmd=Jamaica-dollar
+CurrencyNames/sv/jod=jordansk dinar
+CurrencyNames/sv/jpy=japansk yen
+CurrencyNames/sv/kes=kenyansk shilling
+CurrencyNames/sv/kgs=kirgizisk som
+CurrencyNames/sv/khr=kambodjansk riel
+CurrencyNames/sv/kmf=komorisk franc
+CurrencyNames/sv/kpw=nordkoreansk won
+CurrencyNames/sv/krw=sydkoreansk won
+CurrencyNames/sv/kwd=kuwaitisk dinar
+CurrencyNames/sv/kzt=kazakisk tenge
+CurrencyNames/sv/lak=laotisk kip
+CurrencyNames/sv/lbp=libanesiskt pund
+CurrencyNames/sv/lkr=srilankesisk rupie
+CurrencyNames/sv/lrd=Liberia-dollar
+CurrencyNames/sv/lsl=lesothisk loti
+CurrencyNames/sv/ltl=litauisk litas
+CurrencyNames/sv/luf=luxemburgsk franc
+CurrencyNames/sv/lvl=lettisk lats
+CurrencyNames/sv/lyd=libysk dinar
+CurrencyNames/sv/mad=marockansk dirham
+CurrencyNames/sv/mdl=moldavisk leu
+CurrencyNames/sv/mga=madagaskisk ariary
+CurrencyNames/sv/mgf=madagaskisk franc
+CurrencyNames/sv/mkd=makedonisk denar
+CurrencyNames/sv/mmk=myanmarisk kyat
+CurrencyNames/sv/mnt=mongolisk tugrik
+CurrencyNames/sv/mop=Macao-pataca
+CurrencyNames/sv/mro=mauretansk ouguiya
+CurrencyNames/sv/mtl=maltesisk lira
+CurrencyNames/sv/mur=mauritisk rupie
+CurrencyNames/sv/mvr=maldivisk rufiyaa
+CurrencyNames/sv/mwk=malawisk kwacha
+CurrencyNames/sv/mxn=mexikansk peso
+CurrencyNames/sv/mxv=mexikansk unidad de inversion
+CurrencyNames/sv/myr=malaysisk ringgit
+CurrencyNames/sv/mzm=gammal mo\u00e7ambikisk metical
+CurrencyNames/sv/mzn=mo\u00e7ambikisk metical
+CurrencyNames/sv/nad=Namibia-dollar
+CurrencyNames/sv/ngn=nigeriansk naira
+CurrencyNames/sv/nio=nicaraguansk c\u00f3rdoba oro
+CurrencyNames/sv/nlg=nederl\u00e4ndsk gulden
+CurrencyNames/sv/nok=norsk krona
+CurrencyNames/sv/npr=nepalesisk rupie
+CurrencyNames/sv/nzd=nyzeel\u00e4ndsk dollar
+CurrencyNames/sv/omr=omansk rial
+CurrencyNames/sv/pab=panamansk balboa
+CurrencyNames/sv/pen=peruansk sol nuevo
+CurrencyNames/sv/pgk=papuansk kina
+CurrencyNames/sv/php=filippinsk peso
+CurrencyNames/sv/pkr=pakistansk rupie
+CurrencyNames/sv/pln=polsk zloty
+CurrencyNames/sv/pte=portugisisk escudo
+CurrencyNames/sv/pyg=paraguaysk guarani
+CurrencyNames/sv/qar=qatarisk rial
+CurrencyNames/sv/rol=gammal rum\u00e4nsk leu
+CurrencyNames/sv/ron=rum\u00e4nsk leu
+CurrencyNames/sv/rsd=Serbisk dinar
+CurrencyNames/sv/rub=rysk rubel
+CurrencyNames/sv/rur=rysk rubel (1991-1998)
+CurrencyNames/sv/rwf=rwandisk franc
+CurrencyNames/sv/sar=saudisk riyal
+CurrencyNames/sv/scr=seychellisk rupie
+CurrencyNames/sv/sdd=sudanesisk dinar
+CurrencyNames/sv/sdg=sudanesiskt pund
+CurrencyNames/sv/sek=svensk krona
+CurrencyNames/sv/sgd=Singapore-dollar
+CurrencyNames/sv/sit=slovensk tolar
+CurrencyNames/sv/skk=slovakisk koruna
+CurrencyNames/sv/sll=sierraleonsk leone
+CurrencyNames/sv/sos=somalisk shilling
+CurrencyNames/sv/srd=Surinam-dollar
+CurrencyNames/sv/srg=surinamesisk gulden
+CurrencyNames/sv/svc=salvadoransk col\u00f3n
+CurrencyNames/sv/syp=syriskt pund
+CurrencyNames/sv/szl=swazil\u00e4ndsk lilangeni
+CurrencyNames/sv/thb=thail\u00e4ndsk baht
+CurrencyNames/sv/tjs=tadzjikisk somoni
+CurrencyNames/sv/tmm=turkmensk manat
+CurrencyNames/sv/tnd=tunisisk dinar
+CurrencyNames/sv/top=tongansk pa\u02bbanga
+CurrencyNames/sv/tpe=timoriansk escudo
+CurrencyNames/sv/trl=gammal turkisk lira
+CurrencyNames/sv/try=ny turkisk lira
+CurrencyNames/sv/ttd=Trinidad ochTobago-dollar
+CurrencyNames/sv/twd=taiwanesisk ny dollar
+CurrencyNames/sv/tzs=tanzanisk shilling
+CurrencyNames/sv/uah=ukrainsk hryvnia
+CurrencyNames/sv/ugx=ugandisk shilling
+CurrencyNames/sv/uyu=uruguayansk peso
+CurrencyNames/sv/uzs=uzbekisk sum
+CurrencyNames/sv/veb=venezuelansk bolivar
+CurrencyNames/sv/vef=venezuelansk bolivar fuerte
+CurrencyNames/sv/vnd=vietnamesisk dong
+CurrencyNames/sv/vuv=vanuatisk vatu
+CurrencyNames/sv/wst=v\u00e4stsamoansk tala
+CurrencyNames/sv/xag=silver
+CurrencyNames/sv/xau=guld
+CurrencyNames/sv/xba=europeisk kompositenhet
+CurrencyNames/sv/xbb=europeisk monet\u00e4r enhet
+CurrencyNames/sv/xbc=europeisk kontoenhet (XBC)
+CurrencyNames/sv/xbd=europeisk kontoenhet (XBD)
+CurrencyNames/sv/xcd=\u00f6stkaribisk dollar
+CurrencyNames/sv/xdr=IMF s\u00e4rskild dragningsr\u00e4tt
+CurrencyNames/sv/xfo=fransk guldfranc
+CurrencyNames/sv/xpd=palladium
+CurrencyNames/sv/xpt=platina
+CurrencyNames/sv/xts=test-valutakod
+CurrencyNames/sv/xxx=ok\u00e4nd eller ogiltig valuta
+CurrencyNames/sv/yer=jemenitisk rial
+CurrencyNames/sv/yum=jugoslavisk ny dinar
+CurrencyNames/sv/zar=sydafrikansk rand
+CurrencyNames/sv/zmk=zambisk kwacha
+CurrencyNames/sv/zwd=Zimbabwe-dollar
+
+CurrencyNames/zh_CN/ang=\u8377\u5170\u5b89\u66ff\u5170\u76fe
+CurrencyNames/zh_CN/azm=\u963f\u585e\u62dc\u7586\u9a6c\u7eb3\u7279 (1993-2006)
+CurrencyNames/zh_CN/azn=\u963f\u585e\u62dc\u7586\u9a6c\u7eb3\u7279
+CurrencyNames/zh_CN/csd=\u65e7\u585e\u5c14\u7ef4\u4e9a\u7b2c\u7eb3\u5c14
+CurrencyNames/zh_CN/ghs=\u52a0\u7eb3\u585e\u5730
+CurrencyNames/zh_CN/mzm=\u65e7\u83ab\u6851\u6bd4\u514b\u7f8e\u63d0\u5361
+CurrencyNames/zh_CN/mzn=\u83ab\u6851\u6bd4\u514b\u7f8e\u63d0\u5361
+CurrencyNames/zh_CN/ron=\u7f57\u9a6c\u5c3c\u4e9a\u5217\u4f0a
+CurrencyNames/zh_CN/rsd=\u585e\u5c14\u7ef4\u4e9a\u7b2c\u7eb3\u5c14
+CurrencyNames/zh_CN/shp=\u5723\u8d6b\u52d2\u62ff\u7fa4\u5c9b\u78c5
+CurrencyNames/zh_CN/twd=\u65b0\u53f0\u5e01
+CurrencyNames/zh_CN/vef=\u59d4\u5185\u745e\u62c9\u5f3a\u52bf\u73bb\u5229\u74e6
+CurrencyNames/zh_CN/xxx=\u8d27\u5e01\u672a\u77e5\u6216\u65e0\u6548
+
+CurrencyNames/zh_TW/afa=\u963f\u5bcc\u6c57\u5c3c (1927-2002)
+CurrencyNames/zh_TW/ang=\u53e4\u82f1\u6587
+CurrencyNames/zh_TW/azm=\u4e9e\u585e\u62dc\u7136\u99ac\u7d0d\u7279 (1993-2006)
+CurrencyNames/zh_TW/azn=\u4e9e\u585e\u62dc\u7136\u99ac\u7d0d\u7279
+CurrencyNames/zh_TW/bwp=\u6ce2\u672d\u90a3\u666e\u62c9
+CurrencyNames/zh_TW/bzd=\u8c9d\u91cc\u65af\u5143
+CurrencyNames/zh_TW/csd=\u65e7\u585e\u5c14\u7ef4\u4e9a\u7b2c\u7eb3\u5c14
+CurrencyNames/zh_TW/cyp=\u8cfd\u666e\u52d2\u65af\u938a
+CurrencyNames/zh_TW/ghc=\u8fe6\u7d0d\u4ed9\u8515 (1979-2007)
+CurrencyNames/zh_TW/ghs=\u8fe6\u7d0d\u4ed9\u8515
+CurrencyNames/zh_TW/gwp=\u5e7e\u5167\u4e9e\u6bd4\u7d22\u62ab\u7d22
+CurrencyNames/zh_TW/huf=\u5308\u7259\u5229\u798f\u6797
+CurrencyNames/zh_TW/idr=\u5370\u5c3c\u76fe
+CurrencyNames/zh_TW/inr=\u5370\u5ea6\u76e7\u6bd4
+CurrencyNames/zh_TW/kpw=\u5317\u97d3\u571c
+CurrencyNames/zh_TW/krw=\u97d3\u571c
+CurrencyNames/zh_TW/lak=\u8001\u631d\u57fa\u666e
+CurrencyNames/zh_TW/mad=\u6469\u6d1b\u54e5\u8fea\u62c9\u59c6
+CurrencyNames/zh_TW/mxn=\u58a8\u897f\u54e5\u62ab\u7d22
+CurrencyNames/zh_TW/mxv=\u58a8\u897f\u54e5 Unidad de Inversion (UDI)\uff08\u8d44\u91d1\uff09
+CurrencyNames/zh_TW/myr=\u99ac\u4f86\u897f\u4e9e\u4ee4\u5409
+CurrencyNames/zh_TW/mzn=\u83ab\u4e09\u6bd4\u514b\u7f8e\u63d0\u5361
+CurrencyNames/zh_TW/nio=\u5c3c\u52a0\u62c9\u74dc\u91d1\u79d1\u591a\u5df4
+CurrencyNames/zh_TW/rol=\u65e7\u7f57\u9a6c\u5c3c\u4e9a\u5217\u4f0a
+CurrencyNames/zh_TW/ron=\u7f85\u99ac\u5c3c\u4e9e\u5217\u4f0a
+CurrencyNames/zh_TW/rsd=\u585e\u723e\u7dad\u4e9e\u6234\u7d0d
+CurrencyNames/zh_TW/scr=\u585e\u5e2d\u723e\u76e7\u6bd4
+CurrencyNames/zh_TW/sdg=\u8607\u4e39\u938a
+CurrencyNames/zh_TW/shp=\u5723\u8d6b\u52d2\u62ff\u7fa4\u5c9b\u78c5
+CurrencyNames/zh_TW/srd=\u82cf\u91cc\u5357\u5143
+CurrencyNames/zh_TW/srg=\u8607\u5229\u5357\u57fa\u723e
+CurrencyNames/zh_TW/svc=\u8428\u5c14\u74e6\u591a\u79d1\u6717
+CurrencyNames/zh_TW/szl=\u65af\u5a01\u58eb\u5170\u91cc\u5170\u5409\u5c3c
+CurrencyNames/zh_TW/tpe=\u5e1d\u6c76\u57c3\u65af\u5e93\u591a
+CurrencyNames/zh_TW/ttd=\u7279\u7acb\u5c3c\u8fbe\u548c\u591a\u5df4\u54e5\u5143
+CurrencyNames/zh_TW/tzs=\u5766\u6851\u5c3c\u4e9a\u5148\u4ee4
+CurrencyNames/zh_TW/uzs=\u70cf\u8332\u5225\u514b\u7d22\u59c6
+CurrencyNames/zh_TW/veb=\u59d4\u5167\u745e\u62c9\u73bb\u5229\u74e6
+CurrencyNames/zh_TW/vef=\u59d4\u5167\u745e\u62c9\u5f37\u52e2\u73bb\u5229\u74e6
+CurrencyNames/zh_TW/xaf=\u897f\u975e\u6cd5\u90ce BEAC
+CurrencyNames/zh_TW/xag=XAG
+CurrencyNames/zh_TW/xof=\u897f\u975e\u6cd5\u90ce BCEAO
+CurrencyNames/zh_TW/xpd=\u94af
+CurrencyNames/zh_TW/xpt=\u94c2
+CurrencyNames/zh_TW/xts=XTS
+CurrencyNames/zh_TW/xxx=XXX
+CurrencyNames/zh_TW/yer=\u8449\u9580\u91cc\u96c5
--- a/jdk/test/sun/text/resources/LocaleDataTest.java Thu Apr 07 19:59:28 2011 -0700
+++ b/jdk/test/sun/text/resources/LocaleDataTest.java Mon Apr 11 16:19:20 2011 -0700
@@ -33,7 +33,7 @@
* 6379214 6485516 6486607 4225362 4494727 6533691 6531591 6531593 6570259
* 6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611
* 6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787
- * 6919624 6998391 7019267 7020960 7025837
+ * 6919624 6998391 7019267 7020960 7025837 7020583
* @summary Verify locale data
*
*/