Merge

make/launchers/Makefile.launcher

@@ -155,9 +155,11 @@ endif
 # GUI tools
 ifeq ($(GUI_TOOL),true)
   ifneq ($(PLATFORM), windows)
+    ifneq ($(PLATFORM), macosx)
       # Anything with a GUI needs X11 to be linked in.
       OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11
     endif
+  endif
 endif
 
 # SA tools need special app classpath

src/macosx/classes/com/apple/eawt/_AppEventHandler.java

@@ -157,7 +157,10 @@ class _AppEventHandler {
                 }
             });
         } finally {
-            nativeReplyToAppShouldTerminate(true);
+            // Either we've just called System.exit(), or the app will call
+            // it when processing a WINDOW_CLOSING event. Either way, we reply
+            // to Cocoa that we don't want to exit the event loop yet.
+            nativeReplyToAppShouldTerminate(false);
         }
     }
 

src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java

@@ -29,6 +29,7 @@ import java.awt.BufferCapabilities.FlipContents;
 import java.awt.*;
 import java.awt.Dialog.ModalityType;
 import java.awt.event.*;
+import java.awt.peer.WindowPeer;
 import java.beans.*;
 import java.util.List;
 
@@ -202,6 +203,9 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
     private LWWindowPeer peer;
     private CPlatformView contentView;
     private CPlatformWindow owner;
+    private boolean visible = false; // visibility status from native perspective
+    private boolean undecorated; // initialized in getInitialStyleBits()
+    private Rectangle normalBounds = null; // not-null only for undecorated maximized windows
 
     public CPlatformWindow(final PeerType peerType) {
         super(0, true);
@@ -277,8 +281,8 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
 
         // Either java.awt.Frame or java.awt.Dialog can be undecorated, however java.awt.Window always is undecorated.
         {
-            final boolean undecorated = isFrame ? ((Frame)target).isUndecorated() : (isDialog ? ((Dialog)target).isUndecorated() : true);
-            if (undecorated) styleBits = SET(styleBits, DECORATED, false);
+            this.undecorated = isFrame ? ((Frame)target).isUndecorated() : (isDialog ? ((Dialog)target).isUndecorated() : true);
+            if (this.undecorated) styleBits = SET(styleBits, DECORATED, false);
         }
 
         // Either java.awt.Frame or java.awt.Dialog can be resizable, however java.awt.Window is never resizable
@@ -466,19 +470,62 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
         nativeSetNSWindowBounds(getNSWindowPtr(), x, y, w, h);
     }
 
+    private void zoom() {
+        if (!undecorated) {
+            CWrapper.NSWindow.zoom(getNSWindowPtr());
+        } else {
+            // OS X handles -zoom incorrectly for undecorated windows
+            final boolean isZoomed = this.normalBounds == null;
+            deliverZoom(isZoomed);
+
+            Rectangle toBounds;
+            if (isZoomed) {
+                this.normalBounds = peer.getBounds();
+                long screen = CWrapper.NSWindow.screen(getNSWindowPtr());
+                toBounds = CWrapper.NSScreen.visibleFrame(screen).getBounds();
+                // Flip the y coordinate
+                Rectangle frame = CWrapper.NSScreen.frame(screen).getBounds();
+                toBounds.y = frame.height - toBounds.y - toBounds.height;
+            } else {
+                toBounds = normalBounds;
+                this.normalBounds = null;
+            }
+            setBounds(toBounds.x, toBounds.y, toBounds.width, toBounds.height);
+        }
+    }
+
+    private boolean isVisible() {
+        return this.visible;
+    }
+
     @Override // PlatformWindow
     public void setVisible(boolean visible) {
         final long nsWindowPtr = getNSWindowPtr();
 
-        if (owner != null) {
+        // 1. Process parent-child relationship when hiding
         if (!visible) {
+            // 1a. Unparent my children
+            for (Window w : target.getOwnedWindows()) {
+                WindowPeer p = (WindowPeer)w.getPeer();
+                if (p instanceof LWWindowPeer) {
+                    CPlatformWindow pw = (CPlatformWindow)((LWWindowPeer)p).getPlatformWindow();
+                    if (pw != null && pw.isVisible()) {
+                        CWrapper.NSWindow.removeChildWindow(nsWindowPtr, pw.getNSWindowPtr());
+                    }
+                }
+            }
+
+            // 1b. Unparent myself
+            if (owner != null && owner.isVisible()) {
                 CWrapper.NSWindow.removeChildWindow(owner.getNSWindowPtr(), nsWindowPtr);
             }
         }
 
+        // 2. Configure stuff
         updateIconImages();
         updateFocusabilityForAutoRequestFocus(false);
 
+        // 3. Manage the extended state when hiding
         if (!visible) {
             // Cancel out the current native state of the window
             switch (peer.getState()) {
@@ -486,11 +533,12 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
                     CWrapper.NSWindow.deminiaturize(nsWindowPtr);
                     break;
                 case Frame.MAXIMIZED_BOTH:
-                    CWrapper.NSWindow.zoom(nsWindowPtr);
+                    zoom();
                     break;
             }
         }
 
+        // 4. Actually show or hide the window
         LWWindowPeer blocker = peer.getBlocker();
         if (blocker == null || !visible) {
             // If it ain't blocked, or is being hidden, go regular way
@@ -517,7 +565,9 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
             CWrapper.NSWindow.orderWindow(nsWindowPtr, CWrapper.NSWindow.NSWindowBelow,
                     ((CPlatformWindow)blocker.getPlatformWindow()).getNSWindowPtr());
         }
+        this.visible = visible;
 
+        // 5. Manage the extended state when showing
         if (visible) {
             // Re-apply the extended state as expected in shared code
             if (target instanceof Frame) {
@@ -526,23 +576,41 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
                         CWrapper.NSWindow.miniaturize(nsWindowPtr);
                         break;
                     case Frame.MAXIMIZED_BOTH:
-                        CWrapper.NSWindow.zoom(nsWindowPtr);
+                        zoom();
                         break;
                 }
             }
         }
 
+        // 6. Configure stuff #2
         updateFocusabilityForAutoRequestFocus(true);
 
-        if (owner != null) {
+        // 7. Manage parent-child relationship when showing
         if (visible) {
+            // 7a. Add myself as a child
+            if (owner != null && owner.isVisible()) {
                 CWrapper.NSWindow.addChildWindow(owner.getNSWindowPtr(), nsWindowPtr, CWrapper.NSWindow.NSWindowAbove);
                 if (target.isAlwaysOnTop()) {
                     CWrapper.NSWindow.setLevel(nsWindowPtr, CWrapper.NSWindow.NSFloatingWindowLevel);
                 }
             }
+
+            // 7b. Add my own children to myself
+            for (Window w : target.getOwnedWindows()) {
+                WindowPeer p = (WindowPeer)w.getPeer();
+                if (p instanceof LWWindowPeer) {
+                    CPlatformWindow pw = (CPlatformWindow)((LWWindowPeer)p).getPlatformWindow();
+                    if (pw != null && pw.isVisible()) {
+                        CWrapper.NSWindow.addChildWindow(nsWindowPtr, pw.getNSWindowPtr(), CWrapper.NSWindow.NSWindowAbove);
+                        if (w.isAlwaysOnTop()) {
+                            CWrapper.NSWindow.setLevel(pw.getNSWindowPtr(), CWrapper.NSWindow.NSFloatingWindowLevel);
+                        }
+                    }
+                }
+            }
         }
 
+        // 8. Deal with the blocker of the window being shown
         if (blocker != null && visible) {
             // Make sure the blocker is above its siblings
             ((CPlatformWindow)blocker.getPlatformWindow()).orderAboveSiblings();
@@ -692,7 +760,7 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
                 if (prevWindowState == Frame.MAXIMIZED_BOTH) {
                     // let's return into the normal states first
                     // the zoom call toggles between the normal and the max states
-                    CWrapper.NSWindow.zoom(nsWindowPtr);
+                    zoom();
                 }
                 CWrapper.NSWindow.miniaturize(nsWindowPtr);
                 break;
@@ -701,14 +769,14 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
                     // let's return into the normal states first
                     CWrapper.NSWindow.deminiaturize(nsWindowPtr);
                 }
-                CWrapper.NSWindow.zoom(nsWindowPtr);
+                zoom();
                 break;
             case Frame.NORMAL:
                 if (prevWindowState == Frame.ICONIFIED) {
                     CWrapper.NSWindow.deminiaturize(nsWindowPtr);
                 } else if (prevWindowState == Frame.MAXIMIZED_BOTH) {
                     // the zoom call toggles between the normal and the max states
-                    CWrapper.NSWindow.zoom(nsWindowPtr);
+                    zoom();
                 }
                 break;
             default:
@@ -849,6 +917,12 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
             return;
         }
 
+        // NOTE: the logic will fail if we have a hierarchy like:
+        //       visible root owner
+        //          invisible owner
+        //              visible dialog
+        // However, this is an unlikely scenario for real life apps
+        if (owner.isVisible()) {
             // Recursively pop up the windows from the very bottom so that only
             // the very top-most one becomes the main window
             owner.orderAboveSiblings();
@@ -858,6 +932,8 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
             final long nsWindowOwnerPtr = owner.getNSWindowPtr();
             CWrapper.NSWindow.removeChildWindow(nsWindowOwnerPtr, nsWindowSelfPtr);
             CWrapper.NSWindow.addChildWindow(nsWindowOwnerPtr, nsWindowSelfPtr, CWrapper.NSWindow.NSWindowAbove);
+        }
+
         if (target.isAlwaysOnTop()) {
             CWrapper.NSWindow.setLevel(getNSWindowPtr(), CWrapper.NSWindow.NSFloatingWindowLevel);
         }

src/macosx/native/sun/awt/CMenuItem.m

@@ -125,11 +125,8 @@ AWT_ASSERT_NOT_APPKIT_THREAD;
 
     [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
         AWT_ASSERT_APPKIT_THREAD;
-
-        if (![theKeyEquivalent isEqualToString:@""]) {
         [fMenuItem setKeyEquivalent:theKeyEquivalent];
         [fMenuItem setKeyEquivalentModifierMask:modifierMask];
-        }
         [fMenuItem setTitle:theLabel];
     }];
 }

src/macosx/native/sun/awt/awt.m

@@ -306,6 +306,18 @@ AWT_ASSERT_APPKIT_THREAD;
         // AWT gets here AFTER +[AWTStarter appKitIsRunning:] is called.
         if (verbose) AWT_DEBUG_LOG(@"got out of the AppKit startup mutex");
     }
+
+    // Don't set the delegate until the NSApplication has been created and
+    // its finishLaunching has initialized it.
+    //  ApplicationDelegate is the support code for com.apple.eawt.
+    void (^setDelegateBlock)() = ^(){
+        OSXAPP_SetApplicationDelegate([ApplicationDelegate sharedDelegate]);
+    };
+    if (onMainThread) {
+        setDelegateBlock();
+    } else {
+        [JNFRunLoop performOnMainThreadWaiting:YES withBlock:setDelegateBlock];
+    }
 }
 
 - (void)starter:(NSArray*)args {
@@ -340,10 +352,6 @@ AWT_ASSERT_APPKIT_THREAD;
     //  AppKit Application.
     NSApplication *app = [NSApplicationAWT sharedApplication];
 
-    // Don't set the delegate until the NSApplication has been created.
-    //  ApplicationDelegate is the support code for com.apple.eawt.
-    OSXAPP_SetApplicationDelegate([ApplicationDelegate sharedDelegate]);
-
     // AWT gets to this point BEFORE NSApplicationDidFinishLaunchingNotification is sent.
     if (![app isRunning]) {
         if (verbose) AWT_DEBUG_LOG(@"+[AWTStarter startAWT]: ![app isRunning]");

src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties

@@ -6,78 +6,49 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.nameText=GTK Color Chooser
+GTKColorChooserPanel.textAndMnemonic=&GTK Color Chooser
 # mnemonic as a VK_ constant
-GTKColorChooserPanel.mnemonic=71
-# Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you
-# want an index other than would normally be underlined by
-# GTKColorChooserPanel.mnemonic to be underlined. This is only useful
-# if GTKColorChooserPanel.nameText defines the mnemonic character more
-# than once and you want a character other than the first underlined.
 
-# Text and mnemonics for the spinner. You can also defined a different
-# index for the mnemonic via xxxMnemonicIndex, for example
-# GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second
-# character of GTKColorChooserPanel.hueText should be underlined to
-# represent the mnemonic.
-GTKColorChooserPanel.hueText=Hue:
-GTKColorChooserPanel.hueMnemonic=72
+GTKColorChooserPanel.hue.textAndMnemonic=&Hue:
 
-GTKColorChooserPanel.redText=Red:
-GTKColorChooserPanel.redMnemonic=69
+GTKColorChooserPanel.red.textAndMnemonic=R&ed:
 
-GTKColorChooserPanel.saturationText=Saturation:
-GTKColorChooserPanel.saturationMnemonic=83
+GTKColorChooserPanel.saturation.textAndMnemonic=&Saturation:
 
-GTKColorChooserPanel.greenText=Green:
-GTKColorChooserPanel.greenMnemonic=71
+GTKColorChooserPanel.green.textAndMnemonic=&Green:
 
-GTKColorChooserPanel.valueText=Value:
-GTKColorChooserPanel.valueMnemonic=86
+GTKColorChooserPanel.value.textAndMnemonic=&Value:
 
-GTKColorChooserPanel.blueText=Blue:
-GTKColorChooserPanel.blueMnemonic=66
+GTKColorChooserPanel.blue.textAndMnemonic=&Blue:
 
-GTKColorChooserPanel.colorNameText=Color Name:
-GTKColorChooserPanel.colorNameMnemonic=78
+GTKColorChooserPanel.color.textAndMnemonic=Color &Name:
 
 
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.acceptAllFileFilterText=All Files
-FileChooser.newFolderButtonText=New Folder
-FileChooser.newFolderButtonMnemonic=78
-FileChooser.newFolderDialogText=Folder name:
-FileChooser.newFolderNoDirectoryErrorTitleText=Error
-FileChooser.newFolderNoDirectoryErrorText=Error creating directory "{0}": No such file or directory
-FileChooser.deleteFileButtonText=Delete File
-FileChooser.deleteFileButtonMnemonic=76
-FileChooser.renameFileButtonText=Rename File
-FileChooser.renameFileButtonMnemonic=82
-FileChooser.cancelButtonText=Cancel
-FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=OK
-FileChooser.saveButtonMnemonic=79
-FileChooser.openButtonText=OK
-FileChooser.openButtonMnemonic=79
-FileChooser.saveDialogTitleText=Save
-FileChooser.openDialogTitleText=Open
-FileChooser.pathLabelText=Selection:
-FileChooser.filterLabelText=Filter:
-FileChooser.pathLabelMnemonic=83
-FileChooser.foldersLabelText=Folders
-FileChooser.foldersLabelMnemonic=68
-FileChooser.filesLabelText=Files
-FileChooser.filesLabelMnemonic=70
-
-FileChooser.cancelButtonToolTipText=Abort file chooser dialog.
-FileChooser.saveButtonToolTipText=Save selected file.
-FileChooser.openButtonToolTipText=Open selected file.
-
-FileChooser.renameFileDialogText=Rename file "{0}" to
-FileChooser.renameFileErrorTitle=Error 
-FileChooser.renameFileErrorText=Error renaming file "{0}" to "{1}"
-
-OptionPane.okButtonMnemonic=79
-OptionPane.cancelButtonMnemonic=67
+FileChooser.acceptAllFileFilter.textAndMnemonic=All Files
+FileChooser.newFolderButton.textAndMnemonic=&New Folder
+FileChooser.newFolderDialog.textAndMnemonic=Folder name:
+FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Error
+FileChooser.newFolderNoDirectoryError.textAndMnemonic=Error creating directory "{0}": No such file or directory
+FileChooser.deleteFileButton.textAndMnemonic=De&lete File
+FileChooser.renameFileButton.textAndMnemonic=&Rename File
+FileChooser.cancelButton.textAndMnemonic=&Cancel
+FileChooser.saveButton.textAndMnemonic=&OK
+FileChooser.openButton.textAndMnemonic=&OK
+FileChooser.saveDialogTitle.textAndMnemonic=Save
+FileChooser.openDialogTitle.textAndMnemonic=Open
+FileChooser.pathLabel.textAndMnemonic=&Selection:
+FileChooser.filterLabel.textAndMnemonic=Filter:
+FileChooser.foldersLabel.textAndMnemonic=Fol&ders
+FileChooser.filesLabel.textAndMnemonic=&Files
+
+FileChooser.cancelButtonToolTip.textAndMnemonic=Abort file chooser dialog.
+FileChooser.saveButtonToolTip.textAndMnemonic=Save selected file.
+FileChooser.openButtonToolTip.textAndMnemonic=Open selected file.
+
+FileChooser.renameFileDialog.textAndMnemonic=Rename file "{0}" to
+FileChooser.renameFileError.titleAndMnemonic=Error
+FileChooser.renameFileError.textAndMnemonic=Error renaming file "{0}" to "{1}"
+

src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties

@@ -6,83 +6,54 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.nameText=GTK-Farbauswahl
+GTKColorChooserPanel.textAndMnemonic=&GTK-Farbauswahl
 # mnemonic as a VK_ constant
-GTKColorChooserPanel.mnemonic=71
-# Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you
-# want an index other than would normally be underlined by
-# GTKColorChooserPanel.mnemonic to be underlined. This is only useful
-# if GTKColorChooserPanel.nameText defines the mnemonic character more
-# than once and you want a character other than the first underlined.
 
-# Text and mnemonics for the spinner. You can also defined a different
-# index for the mnemonic via xxxMnemonicIndex, for example
-# GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second
-# character of GTKColorChooserPanel.hueText should be underlined to
-# represent the mnemonic.
-GTKColorChooserPanel.hueText=Farbton:
-GTKColorChooserPanel.hueMnemonic=70
+GTKColorChooserPanel.hue.textAndMnemonic=&Farbton:
 
-GTKColorChooserPanel.redText=Rot:
-GTKColorChooserPanel.redMnemonic=82
+GTKColorChooserPanel.red.textAndMnemonic=&Rot:
 
-GTKColorChooserPanel.saturationText=S\u00E4ttigung:
-GTKColorChooserPanel.saturationMnemonic=83
+GTKColorChooserPanel.saturation.textAndMnemonic=S\u00E4ttigung(&S):
 
-GTKColorChooserPanel.greenText=Gr\u00FCn:
-GTKColorChooserPanel.greenMnemonic=71
+GTKColorChooserPanel.green.textAndMnemonic=Gr\u00FCn(&G):
 
-GTKColorChooserPanel.valueText=Wert:
-GTKColorChooserPanel.valueMnemonic=87
+GTKColorChooserPanel.value.textAndMnemonic=&Wert:
 
-GTKColorChooserPanel.blueText=Blau:
-GTKColorChooserPanel.blueMnemonic=66
+GTKColorChooserPanel.blue.textAndMnemonic=&Blau:
 
-GTKColorChooserPanel.colorNameText=Farbname:
-GTKColorChooserPanel.colorNameMnemonic=78
+GTKColorChooserPanel.color.textAndMnemonic=Farb&name:
 
 
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.acceptAllFileFilterText=Alle Dateien
-FileChooser.newFolderButtonText=Neuer Ordner
-FileChooser.newFolderButtonMnemonic=78
-FileChooser.newFolderDialogText=Ordnername:
-FileChooser.newFolderNoDirectoryErrorTitleText=Fehler
-FileChooser.newFolderNoDirectoryErrorText=Fehler beim Erstellen von Verzeichnis "{0}": Datei oder Verzeichnis nicht vorhanden
-FileChooser.deleteFileButtonText=Datei l\u00F6schen
-FileChooser.deleteFileButtonMnemonic=76
-FileChooser.renameFileButtonText=Datei umbenennen
-FileChooser.renameFileButtonMnemonic=85
-FileChooser.cancelButtonText=Abbrechen
-FileChooser.cancelButtonMnemonic=65
-FileChooser.saveButtonText=OK
-FileChooser.saveButtonMnemonic=79
-FileChooser.openButtonText=OK
-FileChooser.openButtonMnemonic=79
-FileChooser.saveDialogTitleText=Speichern
-FileChooser.openDialogTitleText=\u00D6ffnen
-FileChooser.pathLabelText=Auswahl:
-FileChooser.filterLabelText=Filter:
-FileChooser.pathLabelMnemonic=87
-FileChooser.foldersLabelText=Ordner
-FileChooser.foldersLabelMnemonic=79
-FileChooser.filesLabelText=Dateien
-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.renameFileErrorText=Fehler beim Umbenennen der Datei "{0}" in "{1}"
+FileChooser.acceptAllFileFilter.textAndMnemonic=Alle Dateien
+FileChooser.newFolderButton.textAndMnemonic=&Neuer Ordner
+FileChooser.newFolderDialog.textAndMnemonic=Ordnername:
+FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Fehler
+FileChooser.newFolderNoDirectoryError.textAndMnemonic=Fehler beim Erstellen von Verzeichnis "{0}": Datei oder Verzeichnis nicht vorhanden
+FileChooser.deleteFileButton.textAndMnemonic=Datei l\u00F6schen(&L)
+FileChooser.renameFileButton.textAndMnemonic=Datei &umbenennen
+FileChooser.cancelButton.textAndMnemonic=&Abbrechen
+FileChooser.saveButton.textAndMnemonic=&OK
+FileChooser.openButton.textAndMnemonic=&OK
+FileChooser.saveDialogTitle.textAndMnemonic=Speichern
+FileChooser.openDialogTitle.textAndMnemonic=\u00D6ffnen
+FileChooser.pathLabel.textAndMnemonic=Aus&wahl:
+FileChooser.filterLabel.textAndMnemonic=Filter:
+FileChooser.foldersLabel.textAndMnemonic=&Ordner
+FileChooser.filesLabel.textAndMnemonic=&Dateien
+
+FileChooser.cancelButtonToolTip.textAndMnemonic=Dialogfeld f\u00FCr Dateiauswahl schlie\u00DFen.
+FileChooser.saveButtonToolTip.textAndMnemonic=Ausgew\u00E4hlte Datei speichern.
+FileChooser.openButtonToolTip.textAndMnemonic=Ausgew\u00E4hlte Datei \u00F6ffnen.
+
+FileChooser.renameFileDialog.textAndMnemonic=Datei "{0}" umbenennen in
+FileChooser.renameFileError.titleAndMnemonic=Fehler
+FileChooser.renameFileError.textAndMnemonic=Fehler beim Umbenennen der Datei "{0}" in "{1}"
 
 # dummy resource added for translation automation
-OptionPane.okButtonText=OK
-OptionPane.okButtonMnemonic=79
+OptionPane.okButton.textAndMnemonic=&OK
 # dummy resource added for translation automation
-OptionPane.cancelButtonText=Abbrechen
-OptionPane.cancelButtonMnemonic=65
+OptionPane.cancelButton.textAndMnemonic=&Abbrechen
 

src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties

@@ -6,83 +6,54 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.nameText=Selector de Color para GTK
+GTKColorChooserPanel.textAndMnemonic=Selector de Color para &GTK
 # mnemonic as a VK_ constant
-GTKColorChooserPanel.mnemonic=71
-# Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you
-# want an index other than would normally be underlined by
-# GTKColorChooserPanel.mnemonic to be underlined. This is only useful
-# if GTKColorChooserPanel.nameText defines the mnemonic character more
-# than once and you want a character other than the first underlined.
 
-# Text and mnemonics for the spinner. You can also defined a different
-# index for the mnemonic via xxxMnemonicIndex, for example
-# GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second
-# character of GTKColorChooserPanel.hueText should be underlined to
-# represent the mnemonic.
-GTKColorChooserPanel.hueText=Mat:
-GTKColorChooserPanel.hueMnemonic=77
+GTKColorChooserPanel.hue.textAndMnemonic=&Mat:
 
-GTKColorChooserPanel.redText=Rojo:
-GTKColorChooserPanel.redMnemonic=74
+GTKColorChooserPanel.red.textAndMnemonic=Ro&jo:
 
-GTKColorChooserPanel.saturationText=Saturaci\u00F3n:
-GTKColorChooserPanel.saturationMnemonic=83
+GTKColorChooserPanel.saturation.textAndMnemonic=Saturaci\u00F3n(&S):
 
-GTKColorChooserPanel.greenText=Verde:
-GTKColorChooserPanel.greenMnemonic=69
+GTKColorChooserPanel.green.textAndMnemonic=V&erde:
 
-GTKColorChooserPanel.valueText=Valor:
-GTKColorChooserPanel.valueMnemonic=86
+GTKColorChooserPanel.value.textAndMnemonic=&Valor:
 
-GTKColorChooserPanel.blueText=Azul:
-GTKColorChooserPanel.blueMnemonic=65
+GTKColorChooserPanel.blue.textAndMnemonic=&Azul:
 
-GTKColorChooserPanel.colorNameText=Nombre del Color:
-GTKColorChooserPanel.colorNameMnemonic=78
+GTKColorChooserPanel.color.textAndMnemonic=&Nombre del Color:
 
 
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.acceptAllFileFilterText=Todos los Archivos
-FileChooser.newFolderButtonText=Nueva Carpeta
-FileChooser.newFolderButtonMnemonic=78
-FileChooser.newFolderDialogText=Nombre de la Carpeta:
-FileChooser.newFolderNoDirectoryErrorTitleText=Error
-FileChooser.newFolderNoDirectoryErrorText=Error al crear el directorio "{0}": no existe dicho archivo o directorio
-FileChooser.deleteFileButtonText=Suprimir Archivo
-FileChooser.deleteFileButtonMnemonic=80
-FileChooser.renameFileButtonText=Cambiar Nombre de Archivo
-FileChooser.renameFileButtonMnemonic=82
-FileChooser.cancelButtonText=Cancelar
-FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=Aceptar
-FileChooser.saveButtonMnemonic=65
-FileChooser.openButtonText=Aceptar
-FileChooser.openButtonMnemonic=65
-FileChooser.saveDialogTitleText=Guardar
-FileChooser.openDialogTitleText=Abrir
-FileChooser.pathLabelText=Selecci\u00F3n:
-FileChooser.filterLabelText=Filtro:
-FileChooser.pathLabelMnemonic=83
-FileChooser.foldersLabelText=Carpetas
-FileChooser.foldersLabelMnemonic=84
-FileChooser.filesLabelText=Archivos
-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.renameFileErrorText=Error al cambiar el nombre del archivo "{0}" a "{1}"
+FileChooser.acceptAllFileFilter.textAndMnemonic=Todos los Archivos
+FileChooser.newFolderButton.textAndMnemonic=&Nueva Carpeta
+FileChooser.newFolderDialog.textAndMnemonic=Nombre de la Carpeta:
+FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Error
+FileChooser.newFolderNoDirectoryError.textAndMnemonic=Error al crear el directorio "{0}": no existe dicho archivo o directorio
+FileChooser.deleteFileButton.textAndMnemonic=Su&primir Archivo
+FileChooser.renameFileButton.textAndMnemonic=Cambia&r Nombre de Archivo
+FileChooser.cancelButton.textAndMnemonic=&Cancelar
+FileChooser.saveButton.textAndMnemonic=&Aceptar
+FileChooser.openButton.textAndMnemonic=&Aceptar
+FileChooser.saveDialogTitle.textAndMnemonic=Guardar
+FileChooser.openDialogTitle.textAndMnemonic=Abrir
+FileChooser.pathLabel.textAndMnemonic=Selecci\u00F3n(&S):
+FileChooser.filterLabel.textAndMnemonic=Filtro:
+FileChooser.foldersLabel.textAndMnemonic=Carpe&tas
+FileChooser.filesLabel.textAndMnemonic=&Archivos
+
+FileChooser.cancelButtonToolTip.textAndMnemonic=Abortar cuadro de di\u00E1logo del selector de archivos.
+FileChooser.saveButtonToolTip.textAndMnemonic=Guardar el archivo seleccionado.
+FileChooser.openButtonToolTip.textAndMnemonic=Abrir el archivo seleccionado.
+
+FileChooser.renameFileDialog.textAndMnemonic=Cambiar el nombre del archivo "{0}" por
+FileChooser.renameFileError.titleAndMnemonic=Error
+FileChooser.renameFileError.textAndMnemonic=Error al cambiar el nombre del archivo "{0}" a "{1}"
 
 # dummy resource added for translation automation
-OptionPane.okButtonText=Aceptar
-OptionPane.okButtonMnemonic=65
+OptionPane.okButton.textAndMnemonic=&Aceptar
 # dummy resource added for translation automation
-OptionPane.cancelButtonText=Cancelar
-OptionPane.cancelButtonMnemonic=67
+OptionPane.cancelButton.textAndMnemonic=&Cancelar
 

src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties

@@ -6,83 +6,54 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.nameText=S\u00E9lecteur de couleurs GTK
+GTKColorChooserPanel.textAndMnemonic=S\u00E9lecteur de couleurs GTK(&G)
 # mnemonic as a VK_ constant
-GTKColorChooserPanel.mnemonic=71
-# Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you
-# want an index other than would normally be underlined by
-# GTKColorChooserPanel.mnemonic to be underlined. This is only useful
-# if GTKColorChooserPanel.nameText defines the mnemonic character more
-# than once and you want a character other than the first underlined.
 
-# Text and mnemonics for the spinner. You can also defined a different
-# index for the mnemonic via xxxMnemonicIndex, for example
-# GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second
-# character of GTKColorChooserPanel.hueText should be underlined to
-# represent the mnemonic.
-GTKColorChooserPanel.hueText=Teinte :
-GTKColorChooserPanel.hueMnemonic=84
+GTKColorChooserPanel.hue.textAndMnemonic=&Teinte :
 
-GTKColorChooserPanel.redText=Rouge\u00A0:
-GTKColorChooserPanel.redMnemonic=69
+GTKColorChooserPanel.red.textAndMnemonic=Rouge\u00A0(&E):
 
-GTKColorChooserPanel.saturationText=Saturation :
-GTKColorChooserPanel.saturationMnemonic=83
+GTKColorChooserPanel.saturation.textAndMnemonic=&Saturation :
 
-GTKColorChooserPanel.greenText=Vert :
-GTKColorChooserPanel.greenMnemonic=69
+GTKColorChooserPanel.green.textAndMnemonic=V&ert :
 
-GTKColorChooserPanel.valueText=Valeur :
-GTKColorChooserPanel.valueMnemonic=86
+GTKColorChooserPanel.value.textAndMnemonic=&Valeur :
 
-GTKColorChooserPanel.blueText=Bleu :
-GTKColorChooserPanel.blueMnemonic=66
+GTKColorChooserPanel.blue.textAndMnemonic=&Bleu :
 
-GTKColorChooserPanel.colorNameText=Nom de couleur :
-GTKColorChooserPanel.colorNameMnemonic=78
+GTKColorChooserPanel.color.textAndMnemonic=&Nom de couleur :
 
 
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.acceptAllFileFilterText=Tous les fichiers
-FileChooser.newFolderButtonText=Nouveau dossier
-FileChooser.newFolderButtonMnemonic=78
-FileChooser.newFolderDialogText=Nom du dossier :
-FileChooser.newFolderNoDirectoryErrorTitleText=Erreur
-FileChooser.newFolderNoDirectoryErrorText=Erreur lors de la cr\u00E9ation du r\u00E9pertoire "{0}" : ce fichier ou r\u00E9pertoire n''existe pas
-FileChooser.deleteFileButtonText=Supprimer le fichier
-FileChooser.deleteFileButtonMnemonic=76
-FileChooser.renameFileButtonText=Renommer le fichier
-FileChooser.renameFileButtonMnemonic=82
-FileChooser.cancelButtonText=Annuler
-FileChooser.cancelButtonMnemonic=65
-FileChooser.saveButtonText=OK
-FileChooser.saveButtonMnemonic=79
-FileChooser.openButtonText=OK
-FileChooser.openButtonMnemonic=79
-FileChooser.saveDialogTitleText=Enregistrer
-FileChooser.openDialogTitleText=Ouvrir
-FileChooser.pathLabelText=S\u00E9lection :
-FileChooser.filterLabelText=Filtre :
-FileChooser.pathLabelMnemonic=83
-FileChooser.foldersLabelText=Dossiers
-FileChooser.foldersLabelMnemonic=68
-FileChooser.filesLabelText=Fichiers
-FileChooser.filesLabelMnemonic=70
-
-FileChooser.cancelButtonToolTipText=Ferme la bo\u00EEte de dialogue du s\u00E9lecteur de fichiers.
-FileChooser.saveButtonToolTipText=Enregistre le fichier s\u00E9lectionn\u00E9.
-FileChooser.openButtonToolTipText=Ouvre le fichier s\u00E9lectionn\u00E9.
-
-FileChooser.renameFileDialogText=Renomme le fichier "{0}" en
-FileChooser.renameFileErrorTitle=Erreur
-FileChooser.renameFileErrorText=Erreur lors du changement de nom du fichier "{0}" en "{1}"
+FileChooser.acceptAllFileFilter.textAndMnemonic=Tous les fichiers
+FileChooser.newFolderButton.textAndMnemonic=&Nouveau dossier
+FileChooser.newFolderDialog.textAndMnemonic=Nom du dossier :
+FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Erreur
+FileChooser.newFolderNoDirectoryError.textAndMnemonic=Erreur lors de la cr\u00E9ation du r\u00E9pertoire "{0}" : ce fichier ou r\u00E9pertoire n''existe pas
+FileChooser.deleteFileButton.textAndMnemonic=Supprimer &le fichier
+FileChooser.renameFileButton.textAndMnemonic=&Renommer le fichier
+FileChooser.cancelButton.textAndMnemonic=&Annuler
+FileChooser.saveButton.textAndMnemonic=&OK
+FileChooser.openButton.textAndMnemonic=&OK
+FileChooser.saveDialogTitle.textAndMnemonic=Enregistrer
+FileChooser.openDialogTitle.textAndMnemonic=Ouvrir
+FileChooser.pathLabel.textAndMnemonic=S\u00E9lection (&S):
+FileChooser.filterLabel.textAndMnemonic=Filtre :
+FileChooser.foldersLabel.textAndMnemonic=&Dossiers
+FileChooser.filesLabel.textAndMnemonic=&Fichiers
+
+FileChooser.cancelButtonToolTip.textAndMnemonic=Ferme la bo\u00EEte de dialogue du s\u00E9lecteur de fichiers.
+FileChooser.saveButtonToolTip.textAndMnemonic=Enregistre le fichier s\u00E9lectionn\u00E9.
+FileChooser.openButtonToolTip.textAndMnemonic=Ouvre le fichier s\u00E9lectionn\u00E9.
+
+FileChooser.renameFileDialog.textAndMnemonic=Renomme le fichier "{0}" en
+FileChooser.renameFileError.titleAndMnemonic=Erreur
+FileChooser.renameFileError.textAndMnemonic=Erreur lors du changement de nom du fichier "{0}" en "{1}"
 
 # dummy resource added for translation automation
-OptionPane.okButtonText=OK
-OptionPane.okButtonMnemonic=79
+OptionPane.okButton.textAndMnemonic=&OK
 # dummy resource added for translation automation
-OptionPane.cancelButtonText=Annuler
-OptionPane.cancelButtonMnemonic=65
+OptionPane.cancelButton.textAndMnemonic=&Annuler
 

src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties

@@ -6,83 +6,54 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.nameText=Selezione colore GTK
+GTKColorChooserPanel.textAndMnemonic=Selezione colore &GTK
 # mnemonic as a VK_ constant
-GTKColorChooserPanel.mnemonic=71
-# Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you
-# want an index other than would normally be underlined by
-# GTKColorChooserPanel.mnemonic to be underlined. This is only useful
-# if GTKColorChooserPanel.nameText defines the mnemonic character more
-# than once and you want a character other than the first underlined.
 
-# Text and mnemonics for the spinner. You can also defined a different
-# index for the mnemonic via xxxMnemonicIndex, for example
-# GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second
-# character of GTKColorChooserPanel.hueText should be underlined to
-# represent the mnemonic.
-GTKColorChooserPanel.hueText=Ton.:
-GTKColorChooserPanel.hueMnemonic=84
+GTKColorChooserPanel.hue.textAndMnemonic=&Ton.:
 
-GTKColorChooserPanel.redText=Rosso:
-GTKColorChooserPanel.redMnemonic=79
+GTKColorChooserPanel.red.textAndMnemonic=R&osso:
 
-GTKColorChooserPanel.saturationText=Saturazione:
-GTKColorChooserPanel.saturationMnemonic=83
+GTKColorChooserPanel.saturation.textAndMnemonic=&Saturazione:
 
-GTKColorChooserPanel.greenText=Verde:
-GTKColorChooserPanel.greenMnemonic=69
+GTKColorChooserPanel.green.textAndMnemonic=V&erde:
 
-GTKColorChooserPanel.valueText=Valore:
-GTKColorChooserPanel.valueMnemonic=86
+GTKColorChooserPanel.value.textAndMnemonic=&Valore:
 
-GTKColorChooserPanel.blueText=Blu:
-GTKColorChooserPanel.blueMnemonic=66
+GTKColorChooserPanel.blue.textAndMnemonic=&Blu:
 
-GTKColorChooserPanel.colorNameText=Nome colore:
-GTKColorChooserPanel.colorNameMnemonic=78
+GTKColorChooserPanel.color.textAndMnemonic=&Nome colore:
 
 
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.acceptAllFileFilterText=Tutti i file
-FileChooser.newFolderButtonText=Nuova cartella
-FileChooser.newFolderButtonMnemonic=78
-FileChooser.newFolderDialogText=Nome della cartella:
-FileChooser.newFolderNoDirectoryErrorTitleText=Errore
-FileChooser.newFolderNoDirectoryErrorText=Errore durante la creazione della directory "{0}": file o directory inesistente
-FileChooser.deleteFileButtonText=Elimina file
-FileChooser.deleteFileButtonMnemonic=76
-FileChooser.renameFileButtonText=Rinomina file
-FileChooser.renameFileButtonMnemonic=82
-FileChooser.cancelButtonText=Annulla
-FileChooser.cancelButtonMnemonic=65
-FileChooser.saveButtonText=OK
-FileChooser.saveButtonMnemonic=79
-FileChooser.openButtonText=OK
-FileChooser.openButtonMnemonic=79
-FileChooser.saveDialogTitleText=Salva
-FileChooser.openDialogTitleText=Apri
-FileChooser.pathLabelText=Selezione:
-FileChooser.filterLabelText=Filtro:
-FileChooser.pathLabelMnemonic=83
-FileChooser.foldersLabelText=Cartelle
-FileChooser.foldersLabelMnemonic=84
-FileChooser.filesLabelText=File
-FileChooser.filesLabelMnemonic=70
-
-FileChooser.cancelButtonToolTipText=Chiude la finestra di dialogo di selezione file.
-FileChooser.saveButtonToolTipText=Salva il file selezionato.
-FileChooser.openButtonToolTipText=Apre il file selezionato.
-
-FileChooser.renameFileDialogText=Rinomina file "{0}" in
-FileChooser.renameFileErrorTitle=Errore
-FileChooser.renameFileErrorText=Errore durante la ridenominazione del file "{0}" in "{1}"
+FileChooser.acceptAllFileFilter.textAndMnemonic=Tutti i file
+FileChooser.newFolderButton.textAndMnemonic=&Nuova cartella
+FileChooser.newFolderDialog.textAndMnemonic=Nome della cartella:
+FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Errore
+FileChooser.newFolderNoDirectoryError.textAndMnemonic=Errore durante la creazione della directory "{0}": file o directory inesistente
+FileChooser.deleteFileButton.textAndMnemonic=E&limina file
+FileChooser.renameFileButton.textAndMnemonic=&Rinomina file
+FileChooser.cancelButton.textAndMnemonic=&Annulla
+FileChooser.saveButton.textAndMnemonic=&OK
+FileChooser.openButton.textAndMnemonic=&OK
+FileChooser.saveDialogTitle.textAndMnemonic=Salva
+FileChooser.openDialogTitle.textAndMnemonic=Apri
+FileChooser.pathLabel.textAndMnemonic=&Selezione:
+FileChooser.filterLabel.textAndMnemonic=Filtro:
+FileChooser.foldersLabel.textAndMnemonic=Car&telle
+FileChooser.filesLabel.textAndMnemonic=&File
+
+FileChooser.cancelButtonToolTip.textAndMnemonic=Chiude la finestra di dialogo di selezione file.
+FileChooser.saveButtonToolTip.textAndMnemonic=Salva il file selezionato.
+FileChooser.openButtonToolTip.textAndMnemonic=Apre il file selezionato.
+
+FileChooser.renameFileDialog.textAndMnemonic=Rinomina file "{0}" in
+FileChooser.renameFileError.titleAndMnemonic=Errore
+FileChooser.renameFileError.textAndMnemonic=Errore durante la ridenominazione del file "{0}" in "{1}"
 
 # dummy resource added for translation automation
-OptionPane.okButtonText=OK
-OptionPane.okButtonMnemonic=79
+OptionPane.okButton.textAndMnemonic=&OK
 # dummy resource added for translation automation
-OptionPane.cancelButtonText=Annulla
-OptionPane.cancelButtonMnemonic=65
+OptionPane.cancelButton.textAndMnemonic=&Annulla
 

src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties

@@ -6,79 +6,50 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.nameText=GTK\u30AB\u30E9\u30FC\u30FB\u30C1\u30E5\u30FC\u30B6(G)
+GTKColorChooserPanel.textAndMnemonic=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
-# want an index other than would normally be underlined by
-# GTKColorChooserPanel.mnemonic to be underlined. This is only useful
-# if GTKColorChooserPanel.nameText defines the mnemonic character more
-# than once and you want a character other than the first underlined.
 
-# Text and mnemonics for the spinner. You can also defined a different
-# index for the mnemonic via xxxMnemonicIndex, for example
-# GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second
-# character of GTKColorChooserPanel.hueText should be underlined to
-# represent the mnemonic.
-GTKColorChooserPanel.hueText=\u8272\u76F8(H):
-GTKColorChooserPanel.hueMnemonic=72
+GTKColorChooserPanel.hue.textAndMnemonic=\u8272\u76F8(&H):
 
-GTKColorChooserPanel.redText=\u8D64(E):
-GTKColorChooserPanel.redMnemonic=69
+GTKColorChooserPanel.red.textAndMnemonic=\u8D64(&E):
 
-GTKColorChooserPanel.saturationText=\u5F69\u5EA6(S):
-GTKColorChooserPanel.saturationMnemonic=83
+GTKColorChooserPanel.saturation.textAndMnemonic=\u5F69\u5EA6(&S):
 
-GTKColorChooserPanel.greenText=\u7DD1(G):
-GTKColorChooserPanel.greenMnemonic=71
+GTKColorChooserPanel.green.textAndMnemonic=\u7DD1(&G):
 
-GTKColorChooserPanel.valueText=\u5024(V):
-GTKColorChooserPanel.valueMnemonic=86
+GTKColorChooserPanel.value.textAndMnemonic=\u5024(&V):
 
-GTKColorChooserPanel.blueText=\u9752(B):
-GTKColorChooserPanel.blueMnemonic=66
+GTKColorChooserPanel.blue.textAndMnemonic=\u9752(&B):
 
-GTKColorChooserPanel.colorNameText=\u8272\u540D(N):
-GTKColorChooserPanel.colorNameMnemonic=78
+GTKColorChooserPanel.color.textAndMnemonic=\u8272\u540D(&N):
 
 
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.acceptAllFileFilterText=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB
-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(L)
-FileChooser.deleteFileButtonMnemonic=76
-FileChooser.renameFileButtonText=\u30D5\u30A1\u30A4\u30EB\u306E\u540D\u524D\u5909\u66F4(R)
-FileChooser.renameFileButtonMnemonic=82
-FileChooser.cancelButtonText=\u53D6\u6D88
-FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=OK
-FileChooser.saveButtonMnemonic=79
-FileChooser.openButtonText=OK
-FileChooser.openButtonMnemonic=79
-FileChooser.saveDialogTitleText=\u4FDD\u5B58
-FileChooser.openDialogTitleText=\u958B\u304F
-FileChooser.pathLabelText=\u9078\u629E(S):
-FileChooser.filterLabelText=\u30D5\u30A3\u30EB\u30BF:
-FileChooser.pathLabelMnemonic=83
-FileChooser.foldersLabelText=\u30D5\u30A9\u30EB\u30C0(D)
-FileChooser.foldersLabelMnemonic=68
-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
-FileChooser.saveButtonToolTipText=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3057\u307E\u3059\u3002
-FileChooser.openButtonToolTipText=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304D\u307E\u3059\u3002
-
-FileChooser.renameFileDialogText=\u30D5\u30A1\u30A4\u30EB"{0}"\u3092\u6B21\u306E\u540D\u524D\u306B\u5909\u66F4:
-FileChooser.renameFileErrorTitle=\u30A8\u30E9\u30FC
-FileChooser.renameFileErrorText=\u30D5\u30A1\u30A4\u30EB"{0}"\u306E"{1}"\u3078\u306E\u5909\u66F4\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-
-#OptionPane.okButtonMnemonic=79
-#OptionPane.cancelButtonMnemonic=67
+FileChooser.acceptAllFileFilter.textAndMnemonic=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB
+FileChooser.newFolderButton.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0(&N)
+FileChooser.newFolderDialog.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D:
+FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=\u30A8\u30E9\u30FC
+FileChooser.newFolderNoDirectoryError.textAndMnemonic=\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.deleteFileButton.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u524A\u9664(&L)
+FileChooser.renameFileButton.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u540D\u524D\u5909\u66F4(&R)
+FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88(&C)
+FileChooser.saveButton.textAndMnemonic=&OK
+FileChooser.openButton.textAndMnemonic=&OK
+FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
+FileChooser.openDialogTitle.textAndMnemonic=\u958B\u304F
+FileChooser.pathLabel.textAndMnemonic=\u9078\u629E(&S):
+FileChooser.filterLabel.textAndMnemonic=\u30D5\u30A3\u30EB\u30BF:
+FileChooser.foldersLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0(&D)
+FileChooser.filesLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB(&F)
+
+FileChooser.cancelButtonToolTip.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u30FB\u30C1\u30E5\u30FC\u30B6\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u7D42\u4E86\u3057\u307E\u3059\u3002
+FileChooser.saveButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3057\u307E\u3059\u3002
+FileChooser.openButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304D\u307E\u3059\u3002
+
+FileChooser.renameFileDialog.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB"{0}"\u3092\u6B21\u306E\u540D\u524D\u306B\u5909\u66F4:
+FileChooser.renameFileError.titleAndMnemonic=\u30A8\u30E9\u30FC
+FileChooser.renameFileError.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB"{0}"\u306E"{1}"\u3078\u306E\u5909\u66F4\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
+
 

src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties

@@ -6,79 +6,50 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.nameText=GTK \uC0C9\uC0C1 \uC120\uD0DD\uAE30(G)
+GTKColorChooserPanel.textAndMnemonic=GTK \uC0C9\uC0C1 \uC120\uD0DD\uAE30(&G)
 # mnemonic as a VK_ constant
-GTKColorChooserPanel.mnemonic=71
-# Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you
-# want an index other than would normally be underlined by
-# GTKColorChooserPanel.mnemonic to be underlined. This is only useful
-# if GTKColorChooserPanel.nameText defines the mnemonic character more
-# than once and you want a character other than the first underlined.
 
-# Text and mnemonics for the spinner. You can also defined a different
-# index for the mnemonic via xxxMnemonicIndex, for example
-# GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second
-# character of GTKColorChooserPanel.hueText should be underlined to
-# represent the mnemonic.
-GTKColorChooserPanel.hueText=\uC0C9\uC870(H):
-GTKColorChooserPanel.hueMnemonic=72
+GTKColorChooserPanel.hue.textAndMnemonic=\uC0C9\uC870(&H):
 
-GTKColorChooserPanel.redText=\uBE68\uAC04\uC0C9(E):
-GTKColorChooserPanel.redMnemonic=69
+GTKColorChooserPanel.red.textAndMnemonic=\uBE68\uAC04\uC0C9(&E):
 
-GTKColorChooserPanel.saturationText=\uCC44\uB3C4(S):
-GTKColorChooserPanel.saturationMnemonic=83
+GTKColorChooserPanel.saturation.textAndMnemonic=\uCC44\uB3C4(&S):
 
-GTKColorChooserPanel.greenText=\uB179\uC0C9(G):
-GTKColorChooserPanel.greenMnemonic=71
+GTKColorChooserPanel.green.textAndMnemonic=\uB179\uC0C9(&G):
 
-GTKColorChooserPanel.valueText=\uAC12(V):
-GTKColorChooserPanel.valueMnemonic=86
+GTKColorChooserPanel.value.textAndMnemonic=\uAC12(&V):
 
-GTKColorChooserPanel.blueText=\uD30C\uB780\uC0C9(B):
-GTKColorChooserPanel.blueMnemonic=66
+GTKColorChooserPanel.blue.textAndMnemonic=\uD30C\uB780\uC0C9(&B):
 
-GTKColorChooserPanel.colorNameText=\uC0C9\uC0C1 \uC774\uB984(N):
-GTKColorChooserPanel.colorNameMnemonic=78
+GTKColorChooserPanel.color.textAndMnemonic=\uC0C9\uC0C1 \uC774\uB984(&N):
 
 
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.acceptAllFileFilterText=\uBAA8\uB4E0 \uD30C\uC77C
-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(L)
-FileChooser.deleteFileButtonMnemonic=76
-FileChooser.renameFileButtonText=\uD30C\uC77C \uC774\uB984 \uBC14\uAFB8\uAE30(R)
-FileChooser.renameFileButtonMnemonic=82
-FileChooser.cancelButtonText=\uCDE8\uC18C
-FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=\uD655\uC778
-FileChooser.saveButtonMnemonic=79
-FileChooser.openButtonText=\uD655\uC778
-FileChooser.openButtonMnemonic=79
-FileChooser.saveDialogTitleText=\uC800\uC7A5
-FileChooser.openDialogTitleText=\uC5F4\uAE30
-FileChooser.pathLabelText=\uC120\uD0DD \uC0AC\uD56D(S):
-FileChooser.filterLabelText=\uD544\uD130:
-FileChooser.pathLabelMnemonic=83
-FileChooser.foldersLabelText=\uD3F4\uB354(D)
-FileChooser.foldersLabelMnemonic=68
-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.
-FileChooser.saveButtonToolTipText=\uC120\uD0DD\uB41C \uD30C\uC77C\uC744 \uC800\uC7A5\uD569\uB2C8\uB2E4.
-FileChooser.openButtonToolTipText=\uC120\uD0DD\uB41C \uD30C\uC77C\uC744 \uC5FD\uB2C8\uB2E4.
-
-FileChooser.renameFileDialogText="{0}" \uD30C\uC77C\uC758 \uC774\uB984 \uBC14\uAFB8\uAE30
-FileChooser.renameFileErrorTitle=\uC624\uB958
-FileChooser.renameFileErrorText="{0}" \uD30C\uC77C\uC758 \uC774\uB984\uC744 "{1}"(\uC73C)\uB85C \uBC14\uAFB8\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
-
-#OptionPane.okButtonMnemonic=79
-#OptionPane.cancelButtonMnemonic=67
+FileChooser.acceptAllFileFilter.textAndMnemonic=\uBAA8\uB4E0 \uD30C\uC77C
+FileChooser.newFolderButton.textAndMnemonic=\uC0C8 \uD3F4\uB354(&N)
+FileChooser.newFolderDialog.textAndMnemonic=\uD3F4\uB354 \uC774\uB984:
+FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=\uC624\uB958
+FileChooser.newFolderNoDirectoryError.textAndMnemonic="{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.deleteFileButton.textAndMnemonic=\uD30C\uC77C \uC0AD\uC81C(&L)
+FileChooser.renameFileButton.textAndMnemonic=\uD30C\uC77C \uC774\uB984 \uBC14\uAFB8\uAE30(&R)
+FileChooser.cancelButton.textAndMnemonic=\uCDE8\uC18C(&C)
+FileChooser.saveButton.textAndMnemonic=\uD655\uC778(&O)
+FileChooser.openButton.textAndMnemonic=\uD655\uC778(&O)
+FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5
+FileChooser.openDialogTitle.textAndMnemonic=\uC5F4\uAE30
+FileChooser.pathLabel.textAndMnemonic=\uC120\uD0DD \uC0AC\uD56D(&S):
+FileChooser.filterLabel.textAndMnemonic=\uD544\uD130:
+FileChooser.foldersLabel.textAndMnemonic=\uD3F4\uB354(&D)
+FileChooser.filesLabel.textAndMnemonic=\uD30C\uC77C(&F)
+
+FileChooser.cancelButtonToolTip.textAndMnemonic=\uD30C\uC77C \uC120\uD0DD\uAE30 \uB300\uD654\uC0C1\uC790\uB97C \uC911\uB2E8\uD569\uB2C8\uB2E4.
+FileChooser.saveButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C\uC744 \uC800\uC7A5\uD569\uB2C8\uB2E4.
+FileChooser.openButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C\uC744 \uC5FD\uB2C8\uB2E4.
+
+FileChooser.renameFileDialog.textAndMnemonic="{0}" \uD30C\uC77C\uC758 \uC774\uB984 \uBC14\uAFB8\uAE30
+FileChooser.renameFileError.titleAndMnemonic=\uC624\uB958
+FileChooser.renameFileError.textAndMnemonic="{0}" \uD30C\uC77C\uC758 \uC774\uB984\uC744 "{1}"(\uC73C)\uB85C \uBC14\uAFB8\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
+
 

src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties

@@ -6,83 +6,54 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.nameText=Seletor de Cores do GTK
+GTKColorChooserPanel.textAndMnemonic=Seletor de Cores do &GTK
 # mnemonic as a VK_ constant
-GTKColorChooserPanel.mnemonic=71
-# Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you
-# want an index other than would normally be underlined by
-# GTKColorChooserPanel.mnemonic to be underlined. This is only useful
-# if GTKColorChooserPanel.nameText defines the mnemonic character more
-# than once and you want a character other than the first underlined.
 
-# Text and mnemonics for the spinner. You can also defined a different
-# index for the mnemonic via xxxMnemonicIndex, for example
-# GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second
-# character of GTKColorChooserPanel.hueText should be underlined to
-# represent the mnemonic.
-GTKColorChooserPanel.hueText=Matiz:
-GTKColorChooserPanel.hueMnemonic=77
+GTKColorChooserPanel.hue.textAndMnemonic=&Matiz:
 
-GTKColorChooserPanel.redText=Vermelho:
-GTKColorChooserPanel.redMnemonic=69
+GTKColorChooserPanel.red.textAndMnemonic=V&ermelho:
 
-GTKColorChooserPanel.saturationText=Satura\u00E7\u00E3o:
-GTKColorChooserPanel.saturationMnemonic=83
+GTKColorChooserPanel.saturation.textAndMnemonic=Satura\u00E7\u00E3o(&S):
 
-GTKColorChooserPanel.greenText=Verde:
-GTKColorChooserPanel.greenMnemonic=68
+GTKColorChooserPanel.green.textAndMnemonic=Ver&de:
 
-GTKColorChooserPanel.valueText=Valor:
-GTKColorChooserPanel.valueMnemonic=86
+GTKColorChooserPanel.value.textAndMnemonic=&Valor:
 
-GTKColorChooserPanel.blueText=Azul:
-GTKColorChooserPanel.blueMnemonic=65
+GTKColorChooserPanel.blue.textAndMnemonic=&Azul:
 
-GTKColorChooserPanel.colorNameText=Nome da Cor:
-GTKColorChooserPanel.colorNameMnemonic=78
+GTKColorChooserPanel.color.textAndMnemonic=&Nome da Cor:
 
 
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.acceptAllFileFilterText=Todos os Arquivos
-FileChooser.newFolderButtonText=Nova Pasta
-FileChooser.newFolderButtonMnemonic=78
-FileChooser.newFolderDialogText=Nome da pasta:
-FileChooser.newFolderNoDirectoryErrorTitleText=Erro
-FileChooser.newFolderNoDirectoryErrorText=Erro ao criar o diret\u00F3rio "{0}": N\u00E3o h\u00E1 arquivo ou diret\u00F3rio
-FileChooser.deleteFileButtonText=Deletar Arquivo
-FileChooser.deleteFileButtonMnemonic=76
-FileChooser.renameFileButtonText=Renomear Arquivo
-FileChooser.renameFileButtonMnemonic=82
-FileChooser.cancelButtonText=Cancelar
-FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=OK
-FileChooser.saveButtonMnemonic=79
-FileChooser.openButtonText=OK
-FileChooser.openButtonMnemonic=79
-FileChooser.saveDialogTitleText=Salvar
-FileChooser.openDialogTitleText=Abrir
-FileChooser.pathLabelText=Sele\u00E7\u00E3o:
-FileChooser.filterLabelText=Filtro:
-FileChooser.pathLabelMnemonic=83
-FileChooser.foldersLabelText=Pastas
-FileChooser.foldersLabelMnemonic=80
-FileChooser.filesLabelText=Arquivos
-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.renameFileErrorText=Erro ao renomear o arquivo "{0}" por "{1}"
+FileChooser.acceptAllFileFilter.textAndMnemonic=Todos os Arquivos
+FileChooser.newFolderButton.textAndMnemonic=&Nova Pasta
+FileChooser.newFolderDialog.textAndMnemonic=Nome da pasta:
+FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Erro
+FileChooser.newFolderNoDirectoryError.textAndMnemonic=Erro ao criar o diret\u00F3rio "{0}": N\u00E3o h\u00E1 arquivo ou diret\u00F3rio
+FileChooser.deleteFileButton.textAndMnemonic=De&letar Arquivo
+FileChooser.renameFileButton.textAndMnemonic=&Renomear Arquivo
+FileChooser.cancelButton.textAndMnemonic=&Cancelar
+FileChooser.saveButton.textAndMnemonic=&OK
+FileChooser.openButton.textAndMnemonic=&OK
+FileChooser.saveDialogTitle.textAndMnemonic=Salvar
+FileChooser.openDialogTitle.textAndMnemonic=Abrir
+FileChooser.pathLabel.textAndMnemonic=Sele\u00E7\u00E3o(&S):
+FileChooser.filterLabel.textAndMnemonic=Filtro:
+FileChooser.foldersLabel.textAndMnemonic=&Pastas
+FileChooser.filesLabel.textAndMnemonic=&Arquivos
+
+FileChooser.cancelButtonToolTip.textAndMnemonic=Abortar caixa de di\u00E1logo do seletor de arquivos.
+FileChooser.saveButtonToolTip.textAndMnemonic=Salvar arquivo selecionado.
+FileChooser.openButtonToolTip.textAndMnemonic=Abrir arquivo selecionado.
+
+FileChooser.renameFileDialog.textAndMnemonic=Renomear arquivo "{0}" por
+FileChooser.renameFileError.titleAndMnemonic=Erro
+FileChooser.renameFileError.textAndMnemonic=Erro ao renomear o arquivo "{0}" por "{1}"
 
 # dummy resource added for translation automation
-OptionPane.okButtonText=OK
-OptionPane.okButtonMnemonic=79
+OptionPane.okButton.textAndMnemonic=&OK
 # dummy resource added for translation automation
-OptionPane.cancelButtonText=Cancelar
-OptionPane.cancelButtonMnemonic=67
+OptionPane.cancelButton.textAndMnemonic=&Cancelar
 

src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties

@@ -6,83 +6,54 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.nameText=GTK-f\u00E4rgv\u00E4ljaren
+GTKColorChooserPanel.textAndMnemonic=GTK-f\u00E4rgv\u00E4ljaren(&G)
 # mnemonic as a VK_ constant
-GTKColorChooserPanel.mnemonic=71
-# Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you
-# want an index other than would normally be underlined by
-# GTKColorChooserPanel.mnemonic to be underlined. This is only useful
-# if GTKColorChooserPanel.nameText defines the mnemonic character more
-# than once and you want a character other than the first underlined.
 
-# Text and mnemonics for the spinner. You can also defined a different
-# index for the mnemonic via xxxMnemonicIndex, for example
-# GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second
-# character of GTKColorChooserPanel.hueText should be underlined to
-# represent the mnemonic.
-GTKColorChooserPanel.hueText=Nyans:
-GTKColorChooserPanel.hueMnemonic=78
+GTKColorChooserPanel.hue.textAndMnemonic=&Nyans:
 
-GTKColorChooserPanel.redText=R\u00F6d:
-GTKColorChooserPanel.redMnemonic=82
+GTKColorChooserPanel.red.textAndMnemonic=R\u00F6d(&R):
 
-GTKColorChooserPanel.saturationText=M\u00E4ttnad:
-GTKColorChooserPanel.saturationMnemonic=77
+GTKColorChooserPanel.saturation.textAndMnemonic=M\u00E4ttnad(&M):
 
-GTKColorChooserPanel.greenText=Gr\u00F6n:
-GTKColorChooserPanel.greenMnemonic=71
+GTKColorChooserPanel.green.textAndMnemonic=Gr\u00F6n(&G):
 
-GTKColorChooserPanel.valueText=V\u00E4rde:
-GTKColorChooserPanel.valueMnemonic=86
+GTKColorChooserPanel.value.textAndMnemonic=V\u00E4rde(&V):
 
-GTKColorChooserPanel.blueText=Bl\u00E5:
-GTKColorChooserPanel.blueMnemonic=66
+GTKColorChooserPanel.blue.textAndMnemonic=Bl\u00E5(&B):
 
-GTKColorChooserPanel.colorNameText=F\u00E4rgnamn:
-GTKColorChooserPanel.colorNameMnemonic=70
+GTKColorChooserPanel.color.textAndMnemonic=F\u00E4rgnamn(&F):
 
 
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.acceptAllFileFilterText=Alla filer
-FileChooser.newFolderButtonText=Ny mapp
-FileChooser.newFolderButtonMnemonic=78
-FileChooser.newFolderDialogText=Mapp:
-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=66
-FileChooser.renameFileButtonText=\u00C4ndra namn p\u00E5 filen
-FileChooser.renameFileButtonMnemonic=82
-FileChooser.cancelButtonText=Avbryt
-FileChooser.cancelButtonMnemonic=65
-FileChooser.saveButtonText=OK
-FileChooser.saveButtonMnemonic=79
-FileChooser.openButtonText=OK
-FileChooser.openButtonMnemonic=79
-FileChooser.saveDialogTitleText=Spara
-FileChooser.openDialogTitleText=\u00D6ppna
-FileChooser.pathLabelText=Urval:
-FileChooser.filterLabelText=Filter:
-FileChooser.pathLabelMnemonic=85
-FileChooser.foldersLabelText=Mappar
-FileChooser.foldersLabelMnemonic=80
-FileChooser.filesLabelText=Filer
-FileChooser.filesLabelMnemonic=70
-
-FileChooser.cancelButtonToolTipText=Avbryt dialogrutan Filv\u00E4ljare.
-FileChooser.saveButtonToolTipText=Spara vald fil.
-FileChooser.openButtonToolTipText=\u00D6ppna vald fil.
-
-FileChooser.renameFileDialogText=Namn\u00E4ndra fil "{0}" till
-FileChooser.renameFileErrorTitle=Fel
-FileChooser.renameFileErrorText=Fel vid namn\u00E4ndring av fil "{0}" till "{1}"
+FileChooser.acceptAllFileFilter.textAndMnemonic=Alla filer
+FileChooser.newFolderButton.textAndMnemonic=&Ny mapp
+FileChooser.newFolderDialog.textAndMnemonic=Mapp:
+FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Fel
+FileChooser.newFolderNoDirectoryError.textAndMnemonic=Ett fel intr\u00E4ffade vid f\u00F6rs\u00F6k att skapa katalogen "{0}": Filen eller katalogen finns inte
+FileChooser.deleteFileButton.textAndMnemonic=Ta &bort fil
+FileChooser.renameFileButton.textAndMnemonic=\u00C4ndra namn p\u00E5 filen(&R)
+FileChooser.cancelButton.textAndMnemonic=&Avbryt
+FileChooser.saveButton.textAndMnemonic=&OK
+FileChooser.openButton.textAndMnemonic=&OK
+FileChooser.saveDialogTitle.textAndMnemonic=Spara
+FileChooser.openDialogTitle.textAndMnemonic=\u00D6ppna
+FileChooser.pathLabel.textAndMnemonic=&Urval:
+FileChooser.filterLabel.textAndMnemonic=Filter:
+FileChooser.foldersLabel.textAndMnemonic=Ma&ppar
+FileChooser.filesLabel.textAndMnemonic=&Filer
+
+FileChooser.cancelButtonToolTip.textAndMnemonic=Avbryt dialogrutan Filv\u00E4ljare.
+FileChooser.saveButtonToolTip.textAndMnemonic=Spara vald fil.
+FileChooser.openButtonToolTip.textAndMnemonic=\u00D6ppna vald fil.
+
+FileChooser.renameFileDialog.textAndMnemonic=Namn\u00E4ndra fil "{0}" till
+FileChooser.renameFileError.titleAndMnemonic=Fel
+FileChooser.renameFileError.textAndMnemonic=Fel vid namn\u00E4ndring av fil "{0}" till "{1}"
 
 # dummy resource added for translation automation
-OptionPane.okButtonText=OK
-OptionPane.okButtonMnemonic=79
+OptionPane.okButton.textAndMnemonic=&OK
 # dummy resource added for translation automation
-OptionPane.cancelButtonText=Avbryt
-OptionPane.cancelButtonMnemonic=65
+OptionPane.cancelButton.textAndMnemonic=&Avbryt
 

src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties

@@ -6,79 +6,50 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.nameText=GTK \u989C\u8272\u9009\u62E9\u5668(G)
+GTKColorChooserPanel.textAndMnemonic=GTK \u989C\u8272\u9009\u62E9\u5668(&G)
 # mnemonic as a VK_ constant
-GTKColorChooserPanel.mnemonic=71
-# Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you
-# want an index other than would normally be underlined by
-# GTKColorChooserPanel.mnemonic to be underlined. This is only useful
-# if GTKColorChooserPanel.nameText defines the mnemonic character more
-# than once and you want a character other than the first underlined.
 
-# Text and mnemonics for the spinner. You can also defined a different
-# index for the mnemonic via xxxMnemonicIndex, for example
-# GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second
-# character of GTKColorChooserPanel.hueText should be underlined to
-# represent the mnemonic.
-GTKColorChooserPanel.hueText=\u8272\u8C03(H):
-GTKColorChooserPanel.hueMnemonic=72
+GTKColorChooserPanel.hue.textAndMnemonic=\u8272\u8C03(&H):
 
-GTKColorChooserPanel.redText=\u7EA2\u8272(E):
-GTKColorChooserPanel.redMnemonic=69
+GTKColorChooserPanel.red.textAndMnemonic=\u7EA2\u8272(&E):
 
-GTKColorChooserPanel.saturationText=\u9971\u548C\u5EA6(S):
-GTKColorChooserPanel.saturationMnemonic=83
+GTKColorChooserPanel.saturation.textAndMnemonic=\u9971\u548C\u5EA6(&S):
 
-GTKColorChooserPanel.greenText=\u7EFF\u8272(G):
-GTKColorChooserPanel.greenMnemonic=71
+GTKColorChooserPanel.green.textAndMnemonic=\u7EFF\u8272(&G):
 
-GTKColorChooserPanel.valueText=\u503C(V):
-GTKColorChooserPanel.valueMnemonic=86
+GTKColorChooserPanel.value.textAndMnemonic=\u503C(&V):
 
-GTKColorChooserPanel.blueText=\u84DD\u8272(B):
-GTKColorChooserPanel.blueMnemonic=66
+GTKColorChooserPanel.blue.textAndMnemonic=\u84DD\u8272(&B):
 
-GTKColorChooserPanel.colorNameText=\u989C\u8272\u540D(N):
-GTKColorChooserPanel.colorNameMnemonic=78
+GTKColorChooserPanel.color.textAndMnemonic=\u989C\u8272\u540D(&N):
 
 
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.acceptAllFileFilterText=\u6240\u6709\u6587\u4EF6
-FileChooser.newFolderButtonText=\u65B0\u6587\u4EF6\u5939(N)
-FileChooser.newFolderButtonMnemonic=78
-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(L)
-FileChooser.deleteFileButtonMnemonic=76
-FileChooser.renameFileButtonText=\u91CD\u547D\u540D\u6587\u4EF6(R)
-FileChooser.renameFileButtonMnemonic=82
-FileChooser.cancelButtonText=\u53D6\u6D88
-FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=\u786E\u5B9A
-FileChooser.saveButtonMnemonic=79
-FileChooser.openButtonText=\u786E\u5B9A
-FileChooser.openButtonMnemonic=79
-FileChooser.saveDialogTitleText=\u4FDD\u5B58
-FileChooser.openDialogTitleText=\u6253\u5F00
-FileChooser.pathLabelText=\u9009\u5B9A\u5185\u5BB9(S):
-FileChooser.filterLabelText=\u7B5B\u9009\u5668:
-FileChooser.pathLabelMnemonic=83
-FileChooser.foldersLabelText=\u6587\u4EF6\u5939(D)
-FileChooser.foldersLabelMnemonic=68
-FileChooser.filesLabelText=\u6587\u4EF6(F)
-FileChooser.filesLabelMnemonic=70
-
-FileChooser.cancelButtonToolTipText=\u4E2D\u6B62\u6587\u4EF6\u9009\u62E9\u5668\u5BF9\u8BDD\u6846\u3002
-FileChooser.saveButtonToolTipText=\u4FDD\u5B58\u6240\u9009\u6587\u4EF6\u3002
-FileChooser.openButtonToolTipText=\u6253\u5F00\u6240\u9009\u6587\u4EF6\u3002
-
-FileChooser.renameFileDialogText=\u5C06\u6587\u4EF6 "{0}" \u91CD\u547D\u540D\u4E3A
-FileChooser.renameFileErrorTitle=\u9519\u8BEF
-FileChooser.renameFileErrorText=\u5C06\u6587\u4EF6 "{0}" \u91CD\u547D\u540D\u4E3A "{1}" \u65F6\u51FA\u9519
-
-#OptionPane.okButtonMnemonic=79
-#OptionPane.cancelButtonMnemonic=67
+FileChooser.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6587\u4EF6
+FileChooser.newFolderButton.textAndMnemonic=\u65B0\u6587\u4EF6\u5939(&N)
+FileChooser.newFolderDialog.textAndMnemonic=\u6587\u4EF6\u5939\u540D:
+FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=\u9519\u8BEF
+FileChooser.newFolderNoDirectoryError.textAndMnemonic=\u521B\u5EFA\u76EE\u5F55 "{0}" \u65F6\u51FA\u9519: \u6CA1\u6709\u6B64\u7C7B\u6587\u4EF6\u6216\u76EE\u5F55
+FileChooser.deleteFileButton.textAndMnemonic=\u5220\u9664\u6587\u4EF6(&L)
+FileChooser.renameFileButton.textAndMnemonic=\u91CD\u547D\u540D\u6587\u4EF6(&R)
+FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88(&C)
+FileChooser.saveButton.textAndMnemonic=\u786E\u5B9A(&O)
+FileChooser.openButton.textAndMnemonic=\u786E\u5B9A(&O)
+FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
+FileChooser.openDialogTitle.textAndMnemonic=\u6253\u5F00
+FileChooser.pathLabel.textAndMnemonic=\u9009\u5B9A\u5185\u5BB9(&S):
+FileChooser.filterLabel.textAndMnemonic=\u7B5B\u9009\u5668:
+FileChooser.foldersLabel.textAndMnemonic=\u6587\u4EF6\u5939(&D)
+FileChooser.filesLabel.textAndMnemonic=\u6587\u4EF6(&F)
+
+FileChooser.cancelButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6587\u4EF6\u9009\u62E9\u5668\u5BF9\u8BDD\u6846\u3002
+FileChooser.saveButtonToolTip.textAndMnemonic=\u4FDD\u5B58\u6240\u9009\u6587\u4EF6\u3002
+FileChooser.openButtonToolTip.textAndMnemonic=\u6253\u5F00\u6240\u9009\u6587\u4EF6\u3002
+
+FileChooser.renameFileDialog.textAndMnemonic=\u5C06\u6587\u4EF6 "{0}" \u91CD\u547D\u540D\u4E3A
+FileChooser.renameFileError.titleAndMnemonic=\u9519\u8BEF
+FileChooser.renameFileError.textAndMnemonic=\u5C06\u6587\u4EF6 "{0}" \u91CD\u547D\u540D\u4E3A "{1}" \u65F6\u51FA\u9519
+
 

src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties

@@ -6,79 +6,50 @@
 # GTK specific properties
 
 # GTK color chooser properties:
-GTKColorChooserPanel.nameText=GTK \u8272\u5F69\u9078\u64C7\u5668(G)
+GTKColorChooserPanel.textAndMnemonic=GTK \u8272\u5F69\u9078\u64C7\u5668(&G)
 # mnemonic as a VK_ constant
-GTKColorChooserPanel.mnemonic=71
-# Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you
-# want an index other than would normally be underlined by
-# GTKColorChooserPanel.mnemonic to be underlined. This is only useful
-# if GTKColorChooserPanel.nameText defines the mnemonic character more
-# than once and you want a character other than the first underlined.
 
-# Text and mnemonics for the spinner. You can also defined a different
-# index for the mnemonic via xxxMnemonicIndex, for example
-# GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second
-# character of GTKColorChooserPanel.hueText should be underlined to
-# represent the mnemonic.
-GTKColorChooserPanel.hueText=\u8272\u8ABF(H)\uFF1A
-GTKColorChooserPanel.hueMnemonic=72
+GTKColorChooserPanel.hue.textAndMnemonic=\u8272\u8ABF(&H)\uFF1A
 
-GTKColorChooserPanel.redText=\u7D05(E):
-GTKColorChooserPanel.redMnemonic=69
+GTKColorChooserPanel.red.textAndMnemonic=\u7D05(&E):
 
-GTKColorChooserPanel.saturationText=\u5F69\u5EA6(S):
-GTKColorChooserPanel.saturationMnemonic=83
+GTKColorChooserPanel.saturation.textAndMnemonic=\u5F69\u5EA6(&S):
 
-GTKColorChooserPanel.greenText=\u7DA0(G):
-GTKColorChooserPanel.greenMnemonic=71
+GTKColorChooserPanel.green.textAndMnemonic=\u7DA0(&G):
 
-GTKColorChooserPanel.valueText=\u503C(V):
-GTKColorChooserPanel.valueMnemonic=86
+GTKColorChooserPanel.value.textAndMnemonic=\u503C(&V):
 
-GTKColorChooserPanel.blueText=\u85CD(B):
-GTKColorChooserPanel.blueMnemonic=66
+GTKColorChooserPanel.blue.textAndMnemonic=\u85CD(&B):
 
-GTKColorChooserPanel.colorNameText=\u984F\u8272\u540D\u7A31(N):
-GTKColorChooserPanel.colorNameMnemonic=78
+GTKColorChooserPanel.color.textAndMnemonic=\u984F\u8272\u540D\u7A31(&N):
 
 
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.acceptAllFileFilterText=\u6240\u6709\u6A94\u6848
-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(L)
-FileChooser.deleteFileButtonMnemonic=76
-FileChooser.renameFileButtonText=\u91CD\u65B0\u547D\u540D\u6A94\u6848(R)
-FileChooser.renameFileButtonMnemonic=82
-FileChooser.cancelButtonText=\u53D6\u6D88
-FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=\u78BA\u5B9A
-FileChooser.saveButtonMnemonic=79
-FileChooser.openButtonText=\u78BA\u5B9A
-FileChooser.openButtonMnemonic=79
-FileChooser.saveDialogTitleText=\u5132\u5B58
-FileChooser.openDialogTitleText=\u958B\u555F
-FileChooser.pathLabelText=\u9078\u53D6(S):
-FileChooser.filterLabelText=\u7BE9\u9078:
-FileChooser.pathLabelMnemonic=83
-FileChooser.foldersLabelText=\u8CC7\u6599\u593E(D)
-FileChooser.foldersLabelMnemonic=68
-FileChooser.filesLabelText=\u6A94\u6848(F)
-FileChooser.filesLabelMnemonic=70
-
-FileChooser.cancelButtonToolTipText=\u4E2D\u6B62\u6A94\u6848\u9078\u64C7\u5668\u5C0D\u8A71\u65B9\u584A\u3002
-FileChooser.saveButtonToolTipText=\u5132\u5B58\u9078\u53D6\u7684\u6A94\u6848\u3002
-FileChooser.openButtonToolTipText=\u958B\u555F\u9078\u53D6\u7684\u6A94\u6848\u3002
-
-FileChooser.renameFileDialogText=\u5C07\u6A94\u6848 "{0}" \u91CD\u65B0\u547D\u540D\u70BA
-FileChooser.renameFileErrorTitle=\u932F\u8AA4
-FileChooser.renameFileErrorText=\u5C07\u6A94\u6848 "{0}" \u91CD\u65B0\u547D\u540D\u70BA "{1}" \u6642\u51FA\u73FE\u932F\u8AA4
-
-#OptionPane.okButtonMnemonic=79
-#OptionPane.cancelButtonMnemonic=67
+FileChooser.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6A94\u6848
+FileChooser.newFolderButton.textAndMnemonic=\u65B0\u5EFA\u8CC7\u6599\u593E(&N)
+FileChooser.newFolderDialog.textAndMnemonic=\u8CC7\u6599\u593E\u540D\u7A31:
+FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=\u932F\u8AA4
+FileChooser.newFolderNoDirectoryError.textAndMnemonic=\u5EFA\u7ACB\u76EE\u9304 "{0}" \u6642\u767C\u751F\u932F\u8AA4: \u6C92\u6709\u6B64\u6A94\u6848\u6216\u76EE\u9304
+FileChooser.deleteFileButton.textAndMnemonic=\u522A\u9664\u6A94\u6848(&L)
+FileChooser.renameFileButton.textAndMnemonic=\u91CD\u65B0\u547D\u540D\u6A94\u6848(&R)
+FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88(&C)
+FileChooser.saveButton.textAndMnemonic=\u78BA\u5B9A(&O)
+FileChooser.openButton.textAndMnemonic=\u78BA\u5B9A(&O)
+FileChooser.saveDialogTitle.textAndMnemonic=\u5132\u5B58
+FileChooser.openDialogTitle.textAndMnemonic=\u958B\u555F
+FileChooser.pathLabel.textAndMnemonic=\u9078\u53D6(&S):
+FileChooser.filterLabel.textAndMnemonic=\u7BE9\u9078:
+FileChooser.foldersLabel.textAndMnemonic=\u8CC7\u6599\u593E(&D)
+FileChooser.filesLabel.textAndMnemonic=\u6A94\u6848(&F)
+
+FileChooser.cancelButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6A94\u6848\u9078\u64C7\u5668\u5C0D\u8A71\u65B9\u584A\u3002
+FileChooser.saveButtonToolTip.textAndMnemonic=\u5132\u5B58\u9078\u53D6\u7684\u6A94\u6848\u3002
+FileChooser.openButtonToolTip.textAndMnemonic=\u958B\u555F\u9078\u53D6\u7684\u6A94\u6848\u3002
+
+FileChooser.renameFileDialog.textAndMnemonic=\u5C07\u6A94\u6848 "{0}" \u91CD\u65B0\u547D\u540D\u70BA
+FileChooser.renameFileError.titleAndMnemonic=\u932F\u8AA4
+FileChooser.renameFileError.textAndMnemonic=\u5C07\u6A94\u6848 "{0}" \u91CD\u65B0\u547D\u540D\u70BA "{1}" \u6642\u51FA\u73FE\u932F\u8AA4
+
 

src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties

@@ -15,27 +15,13 @@
 #                        MNEMONIC NOTE:
 # Many of strings in this file are used by widgets that have a
 # mnemonic, for example:
-#   ColorChooser.rgbNameText=RGB
-#   ColorChooser.rgbMnemonic=71
-#   ColorChooser.rgbDisplayedMnemonicIndex=1
+#   ColorChooser.rgbNameTextAndMnemonic=R&GB
+#
 # Indicates that the tab in the ColorChooser for RGB colors will have
 # the text 'RGB', further the mnemonic character will be 'g' and that
 # a decoration will be provided under the 'G'. This will typically
 # look like:  RGB
 #              -
-# 71 corresponds to the decimal value of the VK constant defined
-# in java/awt/KeyEvent.java. VK_G is defined as:
-#
-#    public static final int VK_G              = 0x47;
-#
-# 0x47 is a hex number and needs to be converted to decimal.
-# A simple way to calculate this for a-z is to add 64 to the index of
-# the letter in the alphabet. As 'a' is in the 1st letter the mnemonic
-# for 'a' is 65, 'b' is 66...
-#
-# The xxDisplayedMnemonicIndex is used to indicate the index of the
-# character that should be underlined in the String, with 0
-# corresponding to the first character in the String.
 #
 # One important thing to remember is that the mnemonic MUST exist in
 # the String, if it does not exist you should add text that makes it
@@ -45,31 +31,25 @@
 # @author Steve Wilson
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescriptionText=Generic File
-FileChooser.directoryDescriptionText=Directory
-FileChooser.newFolderErrorText=Error creating new folder
+FileChooser.fileDescription.textAndMnemonic=Generic File
+FileChooser.directoryDescription.textAndMnemonic=Directory
+FileChooser.newFolderError.textAndMnemonic=Error creating new folder
 FileChooser.newFolderErrorSeparator= :
-FileChooser.newFolderParentDoesntExistTitleText=Unable to create folder
-FileChooser.newFolderParentDoesntExistText=Unable to create the folder.\n\nThe system cannot find the path specified.
-FileChooser.renameErrorTitleText=Error Renaming File or Folder
-FileChooser.renameErrorText=Cannot rename {0}
-FileChooser.renameErrorFileExistsText=Cannot rename {0}: A file with the name you specified already exists. \
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=Unable to create folder
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=Unable to create the folder.\n\nThe system cannot find the path specified.
+FileChooser.renameErrorTitle.textAndMnemonic=Error Renaming File or Folder
+FileChooser.renameError.textAndMnemonic=Cannot rename {0}
+FileChooser.renameErrorFileExists.textAndMnemonic=Cannot rename {0}: A file with the name you specified already exists. \
   Specify a different file name.
-FileChooser.acceptAllFileFilterText=All Files
-FileChooser.cancelButtonText=Cancel
-#FileChooser.cancelButtonMnemonic=67 // not needed?
-FileChooser.saveButtonText=Save
-FileChooser.saveButtonMnemonic=83 // not needed?
-FileChooser.openButtonText=Open
-FileChooser.openButtonMnemonic=79 //not needed?
-FileChooser.saveDialogTitleText=Save
-FileChooser.openDialogTitleText=Open
-FileChooser.updateButtonText=Update
-FileChooser.updateButtonMnemonic=85
-FileChooser.helpButtonText=Help
-FileChooser.helpButtonMnemonic=72
-FileChooser.directoryOpenButtonText=Open
-FileChooser.directoryOpenButtonMnemonic=79
+FileChooser.acceptAllFileFilter.textAndMnemonic=All Files
+FileChooser.cancelButton.textAndMnemonic=Cancel
+FileChooser.saveButton.textAndMnemonic=&Save
+FileChooser.openButton.textAndMnemonic=&Open
+FileChooser.saveDialogTitle.textAndMnemonic=Save
+FileChooser.openDialogTitle.textAndMnemonic=Open
+FileChooser.updateButton.textAndMnemonic=&Update
+FileChooser.helpButton.textAndMnemonic=&Help
+FileChooser.directoryOpenButton.textAndMnemonic=&Open
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -84,98 +64,78 @@ FileChooser.other.newFolder.subsequent=NewFolder.{0}
 
 
 ## file chooser tooltips ###
-FileChooser.cancelButtonToolTipText=Abort file chooser dialog
-FileChooser.saveButtonToolTipText=Save selected file
-FileChooser.openButtonToolTipText=Open selected file
-FileChooser.updateButtonToolTipText=Update directory listing
-FileChooser.helpButtonToolTipText=FileChooser help
-FileChooser.directoryOpenButtonToolTipText=Open selected directory
+FileChooser.cancelButtonToolTip.textAndMnemonic=Abort file chooser dialog
+FileChooser.saveButtonToolTip.textAndMnemonic=Save selected file
+FileChooser.openButtonToolTip.textAndMnemonic=Open selected file
+FileChooser.updateButtonToolTip.textAndMnemonic=Update directory listing
+FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser help
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Open selected directory
 
 FileChooser.filesListAccessibleName=Files List
 FileChooser.filesDetailsAccessibleName=Files Details
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=Preview
-ColorChooser.okText=OK
-ColorChooser.cancelText=Cancel
-ColorChooser.resetText=Reset
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=82
-ColorChooser.sampleText=Sample Text  Sample Text
-ColorChooser.swatchesNameText=Swatches
-ColorChooser.swatchesMnemonic=83
-ColorChooser.swatchesRecentText=Recent:
-# 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.hsvMnemonic=72
-ColorChooser.hsvHueText=Hue
-ColorChooser.hsvSaturationText=Saturation
-ColorChooser.hsvValueText=Value
-ColorChooser.hsvTransparencyText=Transparency
-ColorChooser.hslNameText=HSL
-ColorChooser.hslMnemonic=76
-ColorChooser.hslHueText=Hue
-ColorChooser.hslSaturationText=Saturation
-ColorChooser.hslLightnessText=Lightness
-ColorChooser.hslTransparencyText=Transparency
-ColorChooser.rgbNameText=RGB
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbRedText=Red
-ColorChooser.rgbRedMnemonic=68 // not needed?
-ColorChooser.rgbGreenText=Green
-ColorChooser.rgbGreenMnemonic=78 // not needed?
-ColorChooser.rgbBlueText=Blue
-ColorChooser.rgbBlueMnemonic=66 // not needed?
-ColorChooser.rgbAlphaText=Alpha
-ColorChooser.rgbHexCodeText=Color Code
-ColorChooser.rgbHexCodeMnemonic=67
-ColorChooser.cmykNameText=CMYK
-ColorChooser.cmykMnemonic=77
-ColorChooser.cmykCyanText=Cyan
-ColorChooser.cmykMagentaText=Magenta
-ColorChooser.cmykYellowText=Yellow
-ColorChooser.cmykBlackText=Black
-ColorChooser.cmykAlphaText=Alpha
+ColorChooser.preview.textAndMnemonic=Preview
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Cancel
+ColorChooser.reset.textAndMnemonic=&Reset
+ColorChooser.sample.textAndMnemonic=Sample Text  Sample Text
+ColorChooser.swatches.textAndMnemonic=&Swatches
+ColorChooser.swatchesRecent.textAndMnemonic=Recent:
+ColorChooser.hsv.textAndMnemonic=&HSV
+ColorChooser.hsvHue.textAndMnemonic=Hue
+ColorChooser.hsvSaturation.textAndMnemonic=Saturation
+ColorChooser.hsvValue.textAndMnemonic=Value
+ColorChooser.hsvTransparency.textAndMnemonic=Transparency
+ColorChooser.hsl.textAndMnemonic=HS&L
+ColorChooser.hslHue.textAndMnemonic=Hue
+ColorChooser.hslSaturation.textAndMnemonic=Saturation
+ColorChooser.hslLightness.textAndMnemonic=Lightness
+ColorChooser.hslTransparency.textAndMnemonic=Transparency
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=Re&d
+ColorChooser.rgbGreen.textAndMnemonic=Gree&n
+ColorChooser.rgbBlue.textAndMnemonic=&Blue
+ColorChooser.rgbAlpha.textAndMnemonic=Alpha
+ColorChooser.rgbHexCode.textAndMnemonic=&Color Code
+ColorChooser.cmyk.textAndMnemonic=C&MYK
+ColorChooser.cmykCyan.textAndMnemonic=Cyan
+ColorChooser.cmykMagenta.textAndMnemonic=Magenta
+ColorChooser.cmykYellow.textAndMnemonic=Yellow
+ColorChooser.cmykBlack.textAndMnemonic=Black
+ColorChooser.cmykAlpha.textAndMnemonic=Alpha
 
 ############ OPTION PANE STRINGS #############
-# 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=Yes
-OptionPane.yesButtonMnemonic=89
-OptionPane.noButtonText=No
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
+OptionPane.yesButton.textAndMnemonic=&Yes
+OptionPane.noButton.textAndMnemonic=&No
+OptionPane.okButton.textAndMnemonic=OK
 #OptionPane.okButtonMnemonic=0
-OptionPane.cancelButtonText=Cancel
+OptionPane.cancelButton.textAndMnemonic=Cancel
 #OptionPane.cancelButtonMnemonic=0
-OptionPane.titleText=Select an Option
+OptionPane.title.textAndMnemonic=Select an Option
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=Input
+OptionPane.inputDialog.titleAndMnemonic=Input
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=Message
+OptionPane.messageDialog.titleAndMnemonic=Message
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=Printing
-PrintingDialog.titleAbortingText=Printing (Aborting)
+PrintingDialog.titleProgress.textAndMnemonic=Printing
+PrintingDialog.titleAborting.textAndMnemonic=Printing (Aborting)
 
-PrintingDialog.contentInitialText=Printing in progress...
+PrintingDialog.contentInitial.textAndMnemonic=Printing in progress...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=Printed page {0}...
+PrintingDialog.contentProgress.textAndMnemonic=Printed page {0}...
 
-PrintingDialog.contentAbortingText=Printing aborting...
+PrintingDialog.contentAborting.textAndMnemonic=Printing aborting...
 
-PrintingDialog.abortButtonText=Abort
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=Abort Printing
+PrintingDialog.abortButton.textAndMnemonic=&Abort
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Abort Printing
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=Minimize
@@ -184,42 +144,42 @@ InternalFrame.restoreButtonToolTip=Restore
 InternalFrame.closeButtonToolTip=Close
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=Restore
-InternalFrameTitlePane.moveButtonText=Move
-InternalFrameTitlePane.sizeButtonText=Size
-InternalFrameTitlePane.minimizeButtonText=Minimize
-InternalFrameTitlePane.maximizeButtonText=Maximize
-InternalFrameTitlePane.closeButtonText=Close
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Restore
+InternalFrameTitlePane.moveButton.textAndMnemonic=Move
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Size
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimize
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximize
+InternalFrameTitlePane.closeButton.textAndMnemonic=Close
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=Submit Query
-FormView.resetButtonText=Reset
-FormView.browseFileButtonText=Browse...
+FormView.submitButton.textAndMnemonic=Submit Query
+FormView.resetButton.textAndMnemonic=Reset
+FormView.browseFileButton.textAndMnemonic=Browse...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=style change
-AbstractDocument.additionText=addition
-AbstractDocument.deletionText=deletion
-AbstractDocument.undoText=Undo
-AbstractDocument.redoText=Redo
+AbstractDocument.styleChange.textAndMnemonic=style change
+AbstractDocument.addition.textAndMnemonic=addition
+AbstractDocument.deletion.textAndMnemonic=deletion
+AbstractDocument.undo.textAndMnemonic=Undo
+AbstractDocument.redo.textAndMnemonic=Redo
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=click
+AbstractButton.click.textAndMnemonic=click
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=Undo
-AbstractUndoableEdit.redoText=Redo
+AbstractUndoableEdit.undo.textAndMnemonic=Undo
+AbstractUndoableEdit.redo.textAndMnemonic=Redo
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=togglePopup
+ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=Progress...
+ProgressMonitor.progress.textAndMnemonic=Progress...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=left button
-SplitPane.rightButtonText=right button
+SplitPane.leftButton.textAndMnemonic=left button
+SplitPane.rightButton.textAndMnemonic=right button
 # Used for Isindex
 IsindexView.prompt=This is a searchable index.  Enter search keywords:
 

src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties

@@ -15,27 +15,13 @@
 #                        MNEMONIC NOTE:
 # Many of strings in this file are used by widgets that have a
 # mnemonic, for example:
-#   ColorChooser.rgbNameText=RGB
-#   ColorChooser.rgbMnemonic=71
-#   ColorChooser.rgbDisplayedMnemonicIndex=1
+#   ColorChooser.rgbNameTextAndMnemonic=R&GB
+#
 # Indicates that the tab in the ColorChooser for RGB colors will have
 # the text 'RGB', further the mnemonic character will be 'g' and that
 # a decoration will be provided under the 'G'. This will typically
 # look like:  RGB
 #              -
-# 71 corresponds to the decimal value of the VK constant defined
-# in java/awt/KeyEvent.java. VK_G is defined as:
-#
-#    public static final int VK_G              = 0x47;
-#
-# 0x47 is a hex number and needs to be converted to decimal.
-# A simple way to calculate this for a-z is to add 64 to the index of
-# the letter in the alphabet. As 'a' is in the 1st letter the mnemonic
-# for 'a' is 65, 'b' is 66...
-#
-# The xxDisplayedMnemonicIndex is used to indicate the index of the
-# character that should be underlined in the String, with 0
-# corresponding to the first character in the String.
 #
 # One important thing to remember is that the mnemonic MUST exist in
 # the String, if it does not exist you should add text that makes it
@@ -45,30 +31,24 @@
 # @author Steve Wilson
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescriptionText=Allgemeine Datei
-FileChooser.directoryDescriptionText=Verzeichnis
-FileChooser.newFolderErrorText=Fehler beim Erstellen eines neuen Ordners
+FileChooser.fileDescription.textAndMnemonic=Allgemeine Datei
+FileChooser.directoryDescription.textAndMnemonic=Verzeichnis
+FileChooser.newFolderError.textAndMnemonic=Fehler beim Erstellen eines neuen Ordners
 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.acceptAllFileFilterText=Alle Dateien
-FileChooser.cancelButtonText=Abbrechen
-FileChooser.cancelButtonMnemonic=65
-FileChooser.saveButtonText=Speichern
-FileChooser.saveButtonMnemonic=83
-FileChooser.openButtonText=\u00D6ffnen
-FileChooser.openButtonMnemonic=70
-FileChooser.saveDialogTitleText=Speichern
-FileChooser.openDialogTitleText=\u00D6ffnen
-FileChooser.updateButtonText=Aktualisieren
-FileChooser.updateButtonMnemonic=75
-FileChooser.helpButtonText=Hilfe
-FileChooser.helpButtonMnemonic=72
-FileChooser.directoryOpenButtonText=\u00D6ffnen
-FileChooser.directoryOpenButtonMnemonic=70
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=Ordner kann nicht erstellt werden
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=Ordner kann nicht erstellt werden.\n\nSystem kann den angegebenen Pfad nicht finden.
+FileChooser.renameErrorTitle.textAndMnemonic=Fehler beim Umbenennen von Datei oder Ordner
+FileChooser.renameError.textAndMnemonic={0} kann nicht umbenannt werden
+FileChooser.renameErrorFileExists.textAndMnemonic={0} kann nicht umbenannt werden: Es ist bereits eine Datei mit dem angegebenen Namen vorhanden. Geben Sie einen anderen Dateinamen an.
+FileChooser.acceptAllFileFilter.textAndMnemonic=Alle Dateien
+FileChooser.cancelButton.textAndMnemonic=&Abbrechen
+FileChooser.saveButton.textAndMnemonic=&Speichern
+FileChooser.openButton.textAndMnemonic=\u00D6ffnen(&F)
+FileChooser.saveDialogTitle.textAndMnemonic=Speichern
+FileChooser.openDialogTitle.textAndMnemonic=\u00D6ffnen
+FileChooser.updateButton.textAndMnemonic=A&ktualisieren
+FileChooser.helpButton.textAndMnemonic=&Hilfe
+FileChooser.directoryOpenButton.textAndMnemonic=\u00D6ffnen(&F)
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -83,98 +63,76 @@ FileChooser.other.newFolder.subsequent=NewFolder.{0}
 
 
 ## file chooser tooltips ###
-FileChooser.cancelButtonToolTipText=Dialogfeld f\u00FCr Dateiauswahl schlie\u00DFen
-FileChooser.saveButtonToolTipText=Ausgew\u00E4hlte Datei speichern
-FileChooser.openButtonToolTipText=Ausgew\u00E4hlte Datei \u00F6ffnen
-FileChooser.updateButtonToolTipText=Verzeichnisliste aktualisieren
-FileChooser.helpButtonToolTipText=FileChooser-Hilfe
-FileChooser.directoryOpenButtonToolTipText=Ausgew\u00E4hltes Verzeichnis \u00F6ffnen
+FileChooser.cancelButtonToolTip.textAndMnemonic=Dialogfeld f\u00FCr Dateiauswahl schlie\u00DFen
+FileChooser.saveButtonToolTip.textAndMnemonic=Ausgew\u00E4hlte Datei speichern
+FileChooser.openButtonToolTip.textAndMnemonic=Ausgew\u00E4hlte Datei \u00F6ffnen
+FileChooser.updateButtonToolTip.textAndMnemonic=Verzeichnisliste aktualisieren
+FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser-Hilfe
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Ausgew\u00E4hltes Verzeichnis \u00F6ffnen
 
 FileChooser.filesListAccessibleName=Files List
 FileChooser.filesDetailsAccessibleName=Files Details
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=Vorschau
-ColorChooser.okText=OK
-ColorChooser.cancelText=Abbrechen
-ColorChooser.resetText=Zur\u00FCcksetzen
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=90
-ColorChooser.sampleText=Beispieltext  Beispieltext
-ColorChooser.swatchesNameText=Swatches
-ColorChooser.swatchesMnemonic=83
-ColorChooser.swatchesRecentText=Aktuell:
-# 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.hsvMnemonic=72
-ColorChooser.hsvHueText=Farbton
-ColorChooser.hsvSaturationText=S\u00E4ttigung
-ColorChooser.hsvValueText=Wert
-ColorChooser.hsvTransparencyText=Transparenz
-ColorChooser.hslNameText=HSL
-ColorChooser.hslMnemonic=76
-ColorChooser.hslHueText=Farbton
-ColorChooser.hslSaturationText=S\u00E4ttigung
-ColorChooser.hslLightnessText=Helligkeit
-ColorChooser.hslTransparencyText=Transparenz
-ColorChooser.rgbNameText=RGB
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbRedText=Rot
-ColorChooser.rgbRedMnemonic=84
-ColorChooser.rgbGreenText=Gr\u00FCn
-ColorChooser.rgbGreenMnemonic=78
-ColorChooser.rgbBlueText=Blau
-ColorChooser.rgbBlueMnemonic=66
-ColorChooser.rgbAlphaText=Alpha
-ColorChooser.rgbHexCodeText=Farbcode
-ColorChooser.rgbHexCodeMnemonic=70
-ColorChooser.cmykNameText=CMYK
-ColorChooser.cmykMnemonic=77
-ColorChooser.cmykCyanText=Zyan
-ColorChooser.cmykMagentaText=Magenta
-ColorChooser.cmykYellowText=Gelb
-ColorChooser.cmykBlackText=Schwarz
-ColorChooser.cmykAlphaText=Alpha
+ColorChooser.preview.textAndMnemonic=Vorschau
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Abbrechen
+ColorChooser.reset.textAndMnemonic=Zur\u00FCcksetzen(&Z)
+ColorChooser.sample.textAndMnemonic=Beispieltext  Beispieltext
+ColorChooser.swatches.textAndMnemonic=&Swatches
+ColorChooser.swatchesRecent.textAndMnemonic=Aktuell:
+ColorChooser.hsv.textAndMnemonic=&HSV
+ColorChooser.hsvHue.textAndMnemonic=Farbton
+ColorChooser.hsvSaturation.textAndMnemonic=S\u00E4ttigung
+ColorChooser.hsvValue.textAndMnemonic=Wert
+ColorChooser.hsvTransparency.textAndMnemonic=Transparenz
+ColorChooser.hsl.textAndMnemonic=HS&L
+ColorChooser.hslHue.textAndMnemonic=Farbton
+ColorChooser.hslSaturation.textAndMnemonic=S\u00E4ttigung
+ColorChooser.hslLightness.textAndMnemonic=Helligkeit
+ColorChooser.hslTransparency.textAndMnemonic=Transparenz
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=Ro&t
+ColorChooser.rgbGreen.textAndMnemonic=Gr\u00FCn(&N)
+ColorChooser.rgbBlue.textAndMnemonic=&Blau
+ColorChooser.rgbAlpha.textAndMnemonic=Alpha
+ColorChooser.rgbHexCode.textAndMnemonic=&Farbcode
+ColorChooser.cmyk.textAndMnemonic=C&MYK
+ColorChooser.cmykCyan.textAndMnemonic=Zyan
+ColorChooser.cmykMagenta.textAndMnemonic=Magenta
+ColorChooser.cmykYellow.textAndMnemonic=Gelb
+ColorChooser.cmykBlack.textAndMnemonic=Schwarz
+ColorChooser.cmykAlpha.textAndMnemonic=Alpha
 
 ############ OPTION PANE STRINGS #############
-# 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=Ja
-OptionPane.yesButtonMnemonic=74
-OptionPane.noButtonText=Nein
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
-OptionPane.okButtonMnemonic=O
-OptionPane.cancelButtonText=Abbrechen
-OptionPane.cancelButtonMnemonic=A
-OptionPane.titleText=Option ausw\u00E4hlen
+OptionPane.yesButton.textAndMnemonic=&Ja
+OptionPane.noButton.textAndMnemonic=&Nein
+OptionPane.okButton.textAndMnemonic=&OK
+OptionPane.cancelButton.textAndMnemonic=&Abbrechen
+OptionPane.title.textAndMnemonic=Option ausw\u00E4hlen
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=Eingabe
+OptionPane.inputDialog.titleAndMnemonic=Eingabe
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=Meldung
+OptionPane.messageDialog.titleAndMnemonic=Meldung
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=Drucken
-PrintingDialog.titleAbortingText=Drucken (Abbruch)
+PrintingDialog.titleProgress.textAndMnemonic=Drucken
+PrintingDialog.titleAborting.textAndMnemonic=Drucken (Abbruch)
 
-PrintingDialog.contentInitialText=Druckvorgang l\u00E4uft...
+PrintingDialog.contentInitial.textAndMnemonic=Druckvorgang l\u00E4uft...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=Seite {0} wurde gedruckt...
+PrintingDialog.contentProgress.textAndMnemonic=Seite {0} wurde gedruckt...
 
-PrintingDialog.contentAbortingText=Druckvorgang wird abgebrochen...
+PrintingDialog.contentAborting.textAndMnemonic=Druckvorgang wird abgebrochen...
 
-PrintingDialog.abortButtonText=Abbruch
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=Druckvorgang abbrechen
+PrintingDialog.abortButton.textAndMnemonic=&Abbruch
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Druckvorgang abbrechen
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=Minimieren
@@ -183,42 +141,42 @@ InternalFrame.restoreButtonToolTip=Wiederherstellen
 InternalFrame.closeButtonToolTip=Schlie\u00DFen
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=Wiederherstellen
-InternalFrameTitlePane.moveButtonText=Verschieben
-InternalFrameTitlePane.sizeButtonText=Gr\u00F6\u00DFe
-InternalFrameTitlePane.minimizeButtonText=Minimieren
-InternalFrameTitlePane.maximizeButtonText=Maximieren
-InternalFrameTitlePane.closeButtonText=Schlie\u00DFen
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Wiederherstellen
+InternalFrameTitlePane.moveButton.textAndMnemonic=Verschieben
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Gr\u00F6\u00DFe
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimieren
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximieren
+InternalFrameTitlePane.closeButton.textAndMnemonic=Schlie\u00DFen
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=Abfrage weiterleiten
-FormView.resetButtonText=Zur\u00FCcksetzen
-FormView.browseFileButtonText=Durchsuchen...
+FormView.submitButton.textAndMnemonic=Abfrage weiterleiten
+FormView.resetButton.textAndMnemonic=Zur\u00FCcksetzen
+FormView.browseFileButton.textAndMnemonic=Durchsuchen...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=Formatvorlagen\u00E4nderung
-AbstractDocument.additionText=Hinzuf\u00FCgen
-AbstractDocument.deletionText=L\u00F6schen
-AbstractDocument.undoText=R\u00FCckg\u00E4ngig
-AbstractDocument.redoText=Wiederherstellen
+AbstractDocument.styleChange.textAndMnemonic=Formatvorlagen\u00E4nderung
+AbstractDocument.addition.textAndMnemonic=Hinzuf\u00FCgen
+AbstractDocument.deletion.textAndMnemonic=L\u00F6schen
+AbstractDocument.undo.textAndMnemonic=R\u00FCckg\u00E4ngig
+AbstractDocument.redo.textAndMnemonic=Wiederherstellen
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=Klicken
+AbstractButton.click.textAndMnemonic=Klicken
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=R\u00FCckg\u00E4ngig
-AbstractUndoableEdit.redoText=Wiederherstellen
+AbstractUndoableEdit.undo.textAndMnemonic=R\u00FCckg\u00E4ngig
+AbstractUndoableEdit.redo.textAndMnemonic=Wiederherstellen
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=togglePopup
+ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=Fortschritt...
+ProgressMonitor.progress.textAndMnemonic=Fortschritt...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=linke Schaltfl\u00E4che
-SplitPane.rightButtonText=rechte Schaltfl\u00E4che
+SplitPane.leftButton.textAndMnemonic=linke Schaltfl\u00E4che
+SplitPane.rightButton.textAndMnemonic=rechte Schaltfl\u00E4che
 # Used for Isindex
 IsindexView.prompt=Dieser Index kann durchsucht werden. Geben Sie Schl\u00FCsselw\u00F6rter f\u00FCr die Suche ein:
 

src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties

@@ -15,27 +15,12 @@
 #                        MNEMONIC NOTE:
 # Many of strings in this file are used by widgets that have a
 # mnemonic, for example:
-#   ColorChooser.rgbNameText=RGB
-#   ColorChooser.rgbMnemonic=71
-#   ColorChooser.rgbDisplayedMnemonicIndex=1
+#   ColorChooser.rgbNameTextAndMnemonic=R&GB
 # Indicates that the tab in the ColorChooser for RGB colors will have
 # the text 'RGB', further the mnemonic character will be 'g' and that
 # a decoration will be provided under the 'G'. This will typically
 # look like:  RGB
 #              -
-# 71 corresponds to the decimal value of the VK constant defined
-# in java/awt/KeyEvent.java. VK_G is defined as:
-#
-#    public static final int VK_G              = 0x47;
-#
-# 0x47 is a hex number and needs to be converted to decimal.
-# A simple way to calculate this for a-z is to add 64 to the index of
-# the letter in the alphabet. As 'a' is in the 1st letter the mnemonic
-# for 'a' is 65, 'b' is 66...
-#
-# The xxDisplayedMnemonicIndex is used to indicate the index of the
-# character that should be underlined in the String, with 0
-# corresponding to the first character in the String.
 #
 # One important thing to remember is that the mnemonic MUST exist in
 # the String, if it does not exist you should add text that makes it
@@ -45,30 +30,24 @@
 # @author Steve Wilson
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescriptionText=Archivo Gen\u00E9rico
-FileChooser.directoryDescriptionText=Directorio
-FileChooser.newFolderErrorText=Error al crear una nueva carpeta
+FileChooser.fileDescription.textAndMnemonic=Archivo Gen\u00E9rico
+FileChooser.directoryDescription.textAndMnemonic=Directorio
+FileChooser.newFolderError.textAndMnemonic=Error al crear una nueva carpeta
 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.acceptAllFileFilterText=Todos los Archivos
-FileChooser.cancelButtonText=Cancelar
-FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=Guardar
-FileChooser.saveButtonMnemonic=71
-FileChooser.openButtonText=Abrir
-FileChooser.openButtonMnemonic=66
-FileChooser.saveDialogTitleText=Guardar
-FileChooser.openDialogTitleText=Abrir
-FileChooser.updateButtonText=Actualizar
-FileChooser.updateButtonMnemonic=85
-FileChooser.helpButtonText=Ayuda
-FileChooser.helpButtonMnemonic=89
-FileChooser.directoryOpenButtonText=Abrir
-FileChooser.directoryOpenButtonMnemonic=65
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=No se ha podido crear la carpeta
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=No se ha podido crear la carpeta.\n\nEl sistema no puede encontrar la ruta de acceso especificada.
+FileChooser.renameErrorTitle.textAndMnemonic=Error al cambiar el nombre del archivo o carpeta
+FileChooser.renameError.textAndMnemonic=No se puede cambiar el nombre de {0}
+FileChooser.renameErrorFileExists.textAndMnemonic=No se puede cambiar el nombre de {0}: ya existe un archivo con el nombre especificado. Especifique otro nombre de archivo.
+FileChooser.acceptAllFileFilter.textAndMnemonic=Todos los Archivos
+FileChooser.cancelButton.textAndMnemonic=&Cancelar
+FileChooser.saveButton.textAndMnemonic=&Guardar
+FileChooser.openButton.textAndMnemonic=A&brir
+FileChooser.saveDialogTitle.textAndMnemonic=Guardar
+FileChooser.openDialogTitle.textAndMnemonic=Abrir
+FileChooser.updateButton.textAndMnemonic=Act&ualizar
+FileChooser.helpButton.textAndMnemonic=A&yuda
+FileChooser.directoryOpenButton.textAndMnemonic=&Abrir
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -83,98 +62,76 @@ FileChooser.other.newFolder.subsequent=Nueva Carpeta.{0}
 
 
 ## file chooser tooltips ###
-FileChooser.cancelButtonToolTipText=Cuadro de di\u00E1logo para abortar el selector de archivos
-FileChooser.saveButtonToolTipText=Guardar archivo seleccionado
-FileChooser.openButtonToolTipText=Abrir archivo seleccionado
-FileChooser.updateButtonToolTipText=Actualizar lista de directorios
-FileChooser.helpButtonToolTipText=Ayuda del Selector de Archivos
-FileChooser.directoryOpenButtonToolTipText=Abrir directorio seleccionado
+FileChooser.cancelButtonToolTip.textAndMnemonic=Cuadro de di\u00E1logo para abortar el selector de archivos
+FileChooser.saveButtonToolTip.textAndMnemonic=Guardar archivo seleccionado
+FileChooser.openButtonToolTip.textAndMnemonic=Abrir archivo seleccionado
+FileChooser.updateButtonToolTip.textAndMnemonic=Actualizar lista de directorios
+FileChooser.helpButtonToolTip.textAndMnemonic=Ayuda del Selector de Archivos
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Abrir directorio seleccionado
 
 FileChooser.filesListAccessibleName=Files List
 FileChooser.filesDetailsAccessibleName=Files Details
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=Presentaci\u00F3n Preliminar
-ColorChooser.okText=Aceptar
-ColorChooser.cancelText=Cancelar
-ColorChooser.resetText=Restablecer
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=82
-ColorChooser.sampleText=Texto de Ejemplo  Texto de Ejemplo
-ColorChooser.swatchesNameText=Muestras
-ColorChooser.swatchesMnemonic=83
-ColorChooser.swatchesRecentText=Reciente:
-# 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.hsvMnemonic=72
-ColorChooser.hsvHueText=Matiz
-ColorChooser.hsvSaturationText=Saturaci\u00F3n
-ColorChooser.hsvValueText=Valor
-ColorChooser.hsvTransparencyText=Transparencia
-ColorChooser.hslNameText=HSL
-ColorChooser.hslMnemonic=76
-ColorChooser.hslHueText=Matiz
-ColorChooser.hslSaturationText=Saturaci\u00F3n
-ColorChooser.hslLightnessText=Iluminaci\u00F3n
-ColorChooser.hslTransparencyText=Transparencia
-ColorChooser.rgbNameText=RGB
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbRedText=Rojo
-ColorChooser.rgbRedMnemonic=74
-ColorChooser.rgbGreenText=Verde
-ColorChooser.rgbGreenMnemonic=86
-ColorChooser.rgbBlueText=Azul
-ColorChooser.rgbBlueMnemonic=90
-ColorChooser.rgbAlphaText=Alfa
-ColorChooser.rgbHexCodeText=C\u00F3digo de Color
-ColorChooser.rgbHexCodeMnemonic=67
-ColorChooser.cmykNameText=CMYK
-ColorChooser.cmykMnemonic=77
-ColorChooser.cmykCyanText=Cian
-ColorChooser.cmykMagentaText=Magenta
-ColorChooser.cmykYellowText=Amarillo
-ColorChooser.cmykBlackText=Negro
-ColorChooser.cmykAlphaText=Alfa
+ColorChooser.preview.textAndMnemonic=Presentaci\u00F3n Preliminar
+ColorChooser.ok.textAndMnemonic=Aceptar
+ColorChooser.cancel.textAndMnemonic=Cancelar
+ColorChooser.reset.textAndMnemonic=&Restablecer
+ColorChooser.sample.textAndMnemonic=Texto de Ejemplo  Texto de Ejemplo
+ColorChooser.swatches.textAndMnemonic=Mue&stras
+ColorChooser.swatchesRecent.textAndMnemonic=Reciente:
+ColorChooser.hsv.textAndMnemonic=&HSV
+ColorChooser.hsvHue.textAndMnemonic=Matiz
+ColorChooser.hsvSaturation.textAndMnemonic=Saturaci\u00F3n
+ColorChooser.hsvValue.textAndMnemonic=Valor
+ColorChooser.hsvTransparency.textAndMnemonic=Transparencia
+ColorChooser.hsl.textAndMnemonic=HS&L
+ColorChooser.hslHue.textAndMnemonic=Matiz
+ColorChooser.hslSaturation.textAndMnemonic=Saturaci\u00F3n
+ColorChooser.hslLightness.textAndMnemonic=Iluminaci\u00F3n
+ColorChooser.hslTransparency.textAndMnemonic=Transparencia
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=Ro&jo
+ColorChooser.rgbGreen.textAndMnemonic=&Verde
+ColorChooser.rgbBlue.textAndMnemonic=A&zul
+ColorChooser.rgbAlpha.textAndMnemonic=Alfa
+ColorChooser.rgbHexCode.textAndMnemonic=C\u00F3digo de Color(&C)
+ColorChooser.cmyk.textAndMnemonic=C&MYK
+ColorChooser.cmykCyan.textAndMnemonic=Cian
+ColorChooser.cmykMagenta.textAndMnemonic=Magenta
+ColorChooser.cmykYellow.textAndMnemonic=Amarillo
+ColorChooser.cmykBlack.textAndMnemonic=Negro
+ColorChooser.cmykAlpha.textAndMnemonic=Alfa
 
 ############ OPTION PANE STRINGS #############
-# 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=S\u00ED
-OptionPane.yesButtonMnemonic=83
-OptionPane.noButtonText=No
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=Aceptar
-OptionPane.okButtonMnemonic=O
-OptionPane.cancelButtonText=Cancelar
-OptionPane.cancelButtonMnemonic=C
-OptionPane.titleText=Seleccionar una Opci\u00F3n
+OptionPane.yesButton.textAndMnemonic=S\u00ED(&S)
+OptionPane.noButton.textAndMnemonic=&No
+OptionPane.okButton.textAndMnemonic=Aceptar(&O)
+OptionPane.cancelButton.textAndMnemonic=&Cancelar
+OptionPane.title.textAndMnemonic=Seleccionar una Opci\u00F3n
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=Entrada
+OptionPane.inputDialog.titleAndMnemonic=Entrada
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=Mensaje
+OptionPane.messageDialog.titleAndMnemonic=Mensaje
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=Impresi\u00F3n
-PrintingDialog.titleAbortingText=Impresi\u00F3n (Abortando)
+PrintingDialog.titleProgress.textAndMnemonic=Impresi\u00F3n
+PrintingDialog.titleAborting.textAndMnemonic=Impresi\u00F3n (Abortando)
 
-PrintingDialog.contentInitialText=Impresi\u00F3n en curso...
+PrintingDialog.contentInitial.textAndMnemonic=Impresi\u00F3n en curso...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=P\u00E1gina impresa {0}...
+PrintingDialog.contentProgress.textAndMnemonic=P\u00E1gina impresa {0}...
 
-PrintingDialog.contentAbortingText=Abortando la impresi\u00F3n...
+PrintingDialog.contentAborting.textAndMnemonic=Abortando la impresi\u00F3n...
 
-PrintingDialog.abortButtonText=Abortar
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=Abortar Impresi\u00F3n
+PrintingDialog.abortButton.textAndMnemonic=&Abortar
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Abortar Impresi\u00F3n
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=Minimizar
@@ -183,42 +140,42 @@ InternalFrame.restoreButtonToolTip=Restaurar
 InternalFrame.closeButtonToolTip=Cerrar
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=Restaurar
-InternalFrameTitlePane.moveButtonText=Mover
-InternalFrameTitlePane.sizeButtonText=Tama\u00F1o
-InternalFrameTitlePane.minimizeButtonText=Minimizar
-InternalFrameTitlePane.maximizeButtonText=Maximizar
-InternalFrameTitlePane.closeButtonText=Cerrar
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Restaurar
+InternalFrameTitlePane.moveButton.textAndMnemonic=Mover
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Tama\u00F1o
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimizar
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximizar
+InternalFrameTitlePane.closeButton.textAndMnemonic=Cerrar
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=Enviar Consulta
-FormView.resetButtonText=Restablecer
-FormView.browseFileButtonText=Examinar...
+FormView.submitButton.textAndMnemonic=Enviar Consulta
+FormView.resetButton.textAndMnemonic=Restablecer
+FormView.browseFileButton.textAndMnemonic=Examinar...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=cambio de estilo
-AbstractDocument.additionText=agregaci\u00F3n
-AbstractDocument.deletionText=supresi\u00F3n
-AbstractDocument.undoText=Deshacer
-AbstractDocument.redoText=Rehacer
+AbstractDocument.styleChange.textAndMnemonic=cambio de estilo
+AbstractDocument.addition.textAndMnemonic=agregaci\u00F3n
+AbstractDocument.deletion.textAndMnemonic=supresi\u00F3n
+AbstractDocument.undo.textAndMnemonic=Deshacer
+AbstractDocument.redo.textAndMnemonic=Rehacer
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=hacer clic
+AbstractButton.click.textAndMnemonic=hacer clic
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=Deshacer
-AbstractUndoableEdit.redoText=Rehacer
+AbstractUndoableEdit.undo.textAndMnemonic=Deshacer
+AbstractUndoableEdit.redo.textAndMnemonic=Rehacer
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=togglePopup
+ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=Progreso...
+ProgressMonitor.progress.textAndMnemonic=Progreso...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=bot\u00F3n izquierdo
-SplitPane.rightButtonText=bot\u00F3n derecho
+SplitPane.leftButton.textAndMnemonic=bot\u00F3n izquierdo
+SplitPane.rightButton.textAndMnemonic=bot\u00F3n derecho
 # Used for Isindex
 IsindexView.prompt=En este \u00EDndice se pueden efectuar b\u00FAsquedas. Escriba las palabras clave de b\u00FAsqueda:
 

src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties

@@ -15,27 +15,12 @@
 #                        MNEMONIC NOTE:
 # Many of strings in this file are used by widgets that have a
 # mnemonic, for example:
-#   ColorChooser.rgbNameText=RGB
-#   ColorChooser.rgbMnemonic=71
-#   ColorChooser.rgbDisplayedMnemonicIndex=1
+#   ColorChooser.rgbNameTextAndMnemonic=R&GB
 # Indicates that the tab in the ColorChooser for RGB colors will have
 # the text 'RGB', further the mnemonic character will be 'g' and that
 # a decoration will be provided under the 'G'. This will typically
 # look like:  RGB
 #              -
-# 71 corresponds to the decimal value of the VK constant defined
-# in java/awt/KeyEvent.java. VK_G is defined as:
-#
-#    public static final int VK_G              = 0x47;
-#
-# 0x47 is a hex number and needs to be converted to decimal.
-# A simple way to calculate this for a-z is to add 64 to the index of
-# the letter in the alphabet. As 'a' is in the 1st letter the mnemonic
-# for 'a' is 65, 'b' is 66...
-#
-# The xxDisplayedMnemonicIndex is used to indicate the index of the
-# character that should be underlined in the String, with 0
-# corresponding to the first character in the String.
 #
 # One important thing to remember is that the mnemonic MUST exist in
 # the String, if it does not exist you should add text that makes it
@@ -45,30 +30,24 @@
 # @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.fileDescription.textAndMnemonic=Fichier g\u00E9n\u00E9rique
+FileChooser.directoryDescription.textAndMnemonic=R\u00E9pertoire
+FileChooser.newFolderError.textAndMnemonic=Erreur lors de la cr\u00E9ation du dossier
 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.acceptAllFileFilterText=Tous les fichiers
-FileChooser.cancelButtonText=Annuler
-FileChooser.cancelButtonMnemonic=65
-FileChooser.saveButtonText=Enregistrer
-FileChooser.saveButtonMnemonic=83
-FileChooser.openButtonText=Ouvrir
-FileChooser.openButtonMnemonic=79
-FileChooser.saveDialogTitleText=Enregistrer
-FileChooser.openDialogTitleText=Ouvrir
-FileChooser.updateButtonText=Mettre \u00E0 jour
-FileChooser.updateButtonMnemonic=85
-FileChooser.helpButtonText=Aide
-FileChooser.helpButtonMnemonic=65
-FileChooser.directoryOpenButtonText=Ouvrir
-FileChooser.directoryOpenButtonMnemonic=79
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=Impossible de cr\u00E9er le dossier
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=Impossible de cr\u00E9er le dossier.\n\nLe syst\u00E8me ne parvient pas \u00E0 trouver le chemin indiqu\u00E9.
+FileChooser.renameErrorTitle.textAndMnemonic=Erreur lors du changement de nom du fichier ou du dossier
+FileChooser.renameError.textAndMnemonic=Impossible de renommer {0}
+FileChooser.renameErrorFileExists.textAndMnemonic=Impossible de renommer {0} : il existe d\u00E9j\u00E0 un fichier portant le nom indiqu\u00E9. Indiquez-en un autre.
+FileChooser.acceptAllFileFilter.textAndMnemonic=Tous les fichiers
+FileChooser.cancelButton.textAndMnemonic=&Annuler
+FileChooser.saveButton.textAndMnemonic=Enregi&strer
+FileChooser.openButton.textAndMnemonic=&Ouvrir
+FileChooser.saveDialogTitle.textAndMnemonic=Enregistrer
+FileChooser.openDialogTitle.textAndMnemonic=Ouvrir
+FileChooser.updateButton.textAndMnemonic=Mettre \u00E0 jour(&U)
+FileChooser.helpButton.textAndMnemonic=&Aide
+FileChooser.directoryOpenButton.textAndMnemonic=&Ouvrir
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -83,98 +62,76 @@ FileChooser.other.newFolder.subsequent=NewFolder.{0}
 
 
 ## file chooser tooltips ###
-FileChooser.cancelButtonToolTipText=Ferme la bo\u00EEte de dialogue du s\u00E9lecteur de fichiers
-FileChooser.saveButtonToolTipText=Enregistre le fichier s\u00E9lectionn\u00E9
-FileChooser.openButtonToolTipText=Ouvre le fichier s\u00E9lectionn\u00E9
-FileChooser.updateButtonToolTipText=Met \u00E0 jour la liste des r\u00E9pertoires
-FileChooser.helpButtonToolTipText=Aide du s\u00E9lecteur de fichiers
-FileChooser.directoryOpenButtonToolTipText=Ouvre le r\u00E9pertoire s\u00E9lectionn\u00E9
+FileChooser.cancelButtonToolTip.textAndMnemonic=Ferme la bo\u00EEte de dialogue du s\u00E9lecteur de fichiers
+FileChooser.saveButtonToolTip.textAndMnemonic=Enregistre le fichier s\u00E9lectionn\u00E9
+FileChooser.openButtonToolTip.textAndMnemonic=Ouvre le fichier s\u00E9lectionn\u00E9
+FileChooser.updateButtonToolTip.textAndMnemonic=Met \u00E0 jour la liste des r\u00E9pertoires
+FileChooser.helpButtonToolTip.textAndMnemonic=Aide du s\u00E9lecteur de fichiers
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Ouvre le r\u00E9pertoire s\u00E9lectionn\u00E9
 
 FileChooser.filesListAccessibleName=Files List
 FileChooser.filesDetailsAccessibleName=Files Details
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=Aper\u00E7u
-ColorChooser.okText=OK
-ColorChooser.cancelText=Annuler
-ColorChooser.resetText=R\u00E9initialiser
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=82
-ColorChooser.sampleText=Echantillon de texte  Echantillon de texte
-ColorChooser.swatchesNameText=Echantillons
-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=84
-ColorChooser.hsvHueText=Teinte
-ColorChooser.hsvSaturationText=Saturation
-ColorChooser.hsvValueText=Valeur
-ColorChooser.hsvTransparencyText=Transparence
-ColorChooser.hslNameText=TSL
-ColorChooser.hslMnemonic=76
-ColorChooser.hslHueText=Teinte
-ColorChooser.hslSaturationText=Saturation
-ColorChooser.hslLightnessText=Lumi\u00E8re
-ColorChooser.hslTransparencyText=Transparence
-ColorChooser.rgbNameText=RVB
-ColorChooser.rgbMnemonic=86
-ColorChooser.rgbRedText=Rouge
-ColorChooser.rgbRedMnemonic=79
-ColorChooser.rgbGreenText=Vert
-ColorChooser.rgbGreenMnemonic=86
-ColorChooser.rgbBlueText=Bleu
-ColorChooser.rgbBlueMnemonic=66
-ColorChooser.rgbAlphaText=Alpha
-ColorChooser.rgbHexCodeText=Code couleur
-ColorChooser.rgbHexCodeMnemonic=67
-ColorChooser.cmykNameText=CMYK
-ColorChooser.cmykMnemonic=77
-ColorChooser.cmykCyanText=Cyan
-ColorChooser.cmykMagentaText=Magenta
-ColorChooser.cmykYellowText=Jaune
-ColorChooser.cmykBlackText=Noir
-ColorChooser.cmykAlphaText=Alpha
+ColorChooser.preview.textAndMnemonic=Aper\u00E7u
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Annuler
+ColorChooser.reset.textAndMnemonic=R\u00E9initialiser(&R)
+ColorChooser.sample.textAndMnemonic=Echantillon de texte  Echantillon de texte
+ColorChooser.swatches.textAndMnemonic=&Echantillons
+ColorChooser.swatchesRecent.textAndMnemonic=Dernier :
+ColorChooser.hsv.textAndMnemonic=&TSV
+ColorChooser.hsvHue.textAndMnemonic=Teinte
+ColorChooser.hsvSaturation.textAndMnemonic=Saturation
+ColorChooser.hsvValue.textAndMnemonic=Valeur
+ColorChooser.hsvTransparency.textAndMnemonic=Transparence
+ColorChooser.hsl.textAndMnemonic=TS&L
+ColorChooser.hslHue.textAndMnemonic=Teinte
+ColorChooser.hslSaturation.textAndMnemonic=Saturation
+ColorChooser.hslLightness.textAndMnemonic=Lumi\u00E8re
+ColorChooser.hslTransparency.textAndMnemonic=Transparence
+ColorChooser.rgb.textAndMnemonic=R&VB
+ColorChooser.rgbRed.textAndMnemonic=R&ouge
+ColorChooser.rgbGreen.textAndMnemonic=&Vert
+ColorChooser.rgbBlue.textAndMnemonic=&Bleu
+ColorChooser.rgbAlpha.textAndMnemonic=Alpha
+ColorChooser.rgbHexCode.textAndMnemonic=&Code couleur
+ColorChooser.cmyk.textAndMnemonic=C&MYK
+ColorChooser.cmykCyan.textAndMnemonic=Cyan
+ColorChooser.cmykMagenta.textAndMnemonic=Magenta
+ColorChooser.cmykYellow.textAndMnemonic=Jaune
+ColorChooser.cmykBlack.textAndMnemonic=Noir
+ColorChooser.cmykAlpha.textAndMnemonic=Alpha
 
 ############ OPTION PANE STRINGS #############
-# 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=Oui
-OptionPane.yesButtonMnemonic=79
-OptionPane.noButtonText=Non
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
-OptionPane.okButtonMnemonic=O
-OptionPane.cancelButtonText=Annuler
-OptionPane.cancelButtonMnemonic=A
-OptionPane.titleText=S\u00E9lectionner une option
+OptionPane.yesButton.textAndMnemonic=&Oui
+OptionPane.noButton.textAndMnemonic=&Non
+OptionPane.okButton.textAndMnemonic=&OK
+OptionPane.cancelButton.textAndMnemonic=&Annuler
+OptionPane.title.textAndMnemonic=S\u00E9lectionner une option
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=Entr\u00E9e
+OptionPane.inputDialog.titleAndMnemonic=Entr\u00E9e
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=Message
+OptionPane.messageDialog.titleAndMnemonic=Message
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=Impression
-PrintingDialog.titleAbortingText=Impression (abandon)
+PrintingDialog.titleProgress.textAndMnemonic=Impression
+PrintingDialog.titleAborting.textAndMnemonic=Impression (abandon)
 
-PrintingDialog.contentInitialText=Impression en cours...
+PrintingDialog.contentInitial.textAndMnemonic=Impression en cours...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=Page {0} imprim\u00E9e...
+PrintingDialog.contentProgress.textAndMnemonic=Page {0} imprim\u00E9e...
 
-PrintingDialog.contentAbortingText=Abandon de l'impression...
+PrintingDialog.contentAborting.textAndMnemonic=Abandon de l'impression...
 
-PrintingDialog.abortButtonText=Abandonner
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=Abandonner l'impression
+PrintingDialog.abortButton.textAndMnemonic=&Abandonner
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Abandonner l'impression
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=R\u00E9duire
@@ -183,42 +140,42 @@ InternalFrame.restoreButtonToolTip=Restaurer
 InternalFrame.closeButtonToolTip=Fermer
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=Restaurer
-InternalFrameTitlePane.moveButtonText=D\u00E9placer
-InternalFrameTitlePane.sizeButtonText=Taille
-InternalFrameTitlePane.minimizeButtonText=R\u00E9duire
-InternalFrameTitlePane.maximizeButtonText=Agrandir
-InternalFrameTitlePane.closeButtonText=Fermer
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Restaurer
+InternalFrameTitlePane.moveButton.textAndMnemonic=D\u00E9placer
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Taille
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=R\u00E9duire
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Agrandir
+InternalFrameTitlePane.closeButton.textAndMnemonic=Fermer
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=Soumettre la requ\u00EAte
-FormView.resetButtonText=R\u00E9initialiser
-FormView.browseFileButtonText=Parcourir...
+FormView.submitButton.textAndMnemonic=Soumettre la requ\u00EAte
+FormView.resetButton.textAndMnemonic=R\u00E9initialiser
+FormView.browseFileButton.textAndMnemonic=Parcourir...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=modification de style
-AbstractDocument.additionText=ajout
-AbstractDocument.deletionText=suppression
-AbstractDocument.undoText=Annuler
-AbstractDocument.redoText=R\u00E9tablir
+AbstractDocument.styleChange.textAndMnemonic=modification de style
+AbstractDocument.addition.textAndMnemonic=ajout
+AbstractDocument.deletion.textAndMnemonic=suppression
+AbstractDocument.undo.textAndMnemonic=Annuler
+AbstractDocument.redo.textAndMnemonic=R\u00E9tablir
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=cliquer
+AbstractButton.click.textAndMnemonic=cliquer
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=Annuler
-AbstractUndoableEdit.redoText=R\u00E9tablir
+AbstractUndoableEdit.undo.textAndMnemonic=Annuler
+AbstractUndoableEdit.redo.textAndMnemonic=R\u00E9tablir
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=togglePopup
+ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=Progression...
+ProgressMonitor.progress.textAndMnemonic=Progression...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=bouton gauche
-SplitPane.rightButtonText=bouton droit
+SplitPane.leftButton.textAndMnemonic=bouton gauche
+SplitPane.rightButton.textAndMnemonic=bouton droit
 # Used for Isindex
 IsindexView.prompt=Ceci est un index de recherche. Tapez des mots-cl\u00E9s pour la recherche :
 

src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties

@@ -15,27 +15,12 @@
 #                        MNEMONIC NOTE:
 # Many of strings in this file are used by widgets that have a
 # mnemonic, for example:
-#   ColorChooser.rgbNameText=RGB
-#   ColorChooser.rgbMnemonic=71
-#   ColorChooser.rgbDisplayedMnemonicIndex=1
+#   ColorChooser.rgbNameTextAndMnemonic=R&GB
 # Indicates that the tab in the ColorChooser for RGB colors will have
 # the text 'RGB', further the mnemonic character will be 'g' and that
 # a decoration will be provided under the 'G'. This will typically
 # look like:  RGB
 #              -
-# 71 corresponds to the decimal value of the VK constant defined
-# in java/awt/KeyEvent.java. VK_G is defined as:
-#
-#    public static final int VK_G              = 0x47;
-#
-# 0x47 is a hex number and needs to be converted to decimal.
-# A simple way to calculate this for a-z is to add 64 to the index of
-# the letter in the alphabet. As 'a' is in the 1st letter the mnemonic
-# for 'a' is 65, 'b' is 66...
-#
-# The xxDisplayedMnemonicIndex is used to indicate the index of the
-# character that should be underlined in the String, with 0
-# corresponding to the first character in the String.
 #
 # One important thing to remember is that the mnemonic MUST exist in
 # the String, if it does not exist you should add text that makes it
@@ -45,30 +30,24 @@
 # @author Steve Wilson
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescriptionText=File generico
-FileChooser.directoryDescriptionText=Directory
-FileChooser.newFolderErrorText=Errore durante la creazione della nuova cartella
+FileChooser.fileDescription.textAndMnemonic=File generico
+FileChooser.directoryDescription.textAndMnemonic=Directory
+FileChooser.newFolderError.textAndMnemonic=Errore durante la creazione della nuova cartella
 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.acceptAllFileFilterText=Tutti i file
-FileChooser.cancelButtonText=Annulla
-FileChooser.cancelButtonMnemonic=65
-FileChooser.saveButtonText=Salva
-FileChooser.saveButtonMnemonic=86
-FileChooser.openButtonText=Apri
-FileChooser.openButtonMnemonic=80
-FileChooser.saveDialogTitleText=Salva
-FileChooser.openDialogTitleText=Apri
-FileChooser.updateButtonText=Aggiorna
-FileChooser.updateButtonMnemonic=71
-FileChooser.helpButtonText=?(H)
-FileChooser.helpButtonMnemonic=72
-FileChooser.directoryOpenButtonText=Apri
-FileChooser.directoryOpenButtonMnemonic=65
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=Impossibile creare la cartella
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=Impossibile creare la cartella.\n\nIl sistema non \u00E8 in grado di trovare il percorso specificato.
+FileChooser.renameErrorTitle.textAndMnemonic=Errore durante la ridenominazione del file o della cartella
+FileChooser.renameError.textAndMnemonic=Impossibile rinominare {0}
+FileChooser.renameErrorFileExists.textAndMnemonic=Impossibile rinominare {0}: esiste gi\u00E0 un file con il nome specificato. Specificare un altro nome.
+FileChooser.acceptAllFileFilter.textAndMnemonic=Tutti i file
+FileChooser.cancelButton.textAndMnemonic=&Annulla
+FileChooser.saveButton.textAndMnemonic=Sal&va
+FileChooser.openButton.textAndMnemonic=A&pri
+FileChooser.saveDialogTitle.textAndMnemonic=Salva
+FileChooser.openDialogTitle.textAndMnemonic=Apri
+FileChooser.updateButton.textAndMnemonic=A&ggiorna
+FileChooser.helpButton.textAndMnemonic=?(&H)
+FileChooser.directoryOpenButton.textAndMnemonic=&Apri
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -83,98 +62,76 @@ FileChooser.other.newFolder.subsequent=NewFolder.{0}
 
 
 ## file chooser tooltips ###
-FileChooser.cancelButtonToolTipText=Chiude la finestra di dialogo di selezione file
-FileChooser.saveButtonToolTipText=Salva il file selezionato
-FileChooser.openButtonToolTipText=Apre il file selezionato
-FileChooser.updateButtonToolTipText=Aggiorna la lista directory
-FileChooser.helpButtonToolTipText=Guida FileChooser
-FileChooser.directoryOpenButtonToolTipText=Apre la directory selezionata
+FileChooser.cancelButtonToolTip.textAndMnemonic=Chiude la finestra di dialogo di selezione file
+FileChooser.saveButtonToolTip.textAndMnemonic=Salva il file selezionato
+FileChooser.openButtonToolTip.textAndMnemonic=Apre il file selezionato
+FileChooser.updateButtonToolTip.textAndMnemonic=Aggiorna la lista directory
+FileChooser.helpButtonToolTip.textAndMnemonic=Guida FileChooser
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Apre la directory selezionata
 
 FileChooser.filesListAccessibleName=Files List
 FileChooser.filesDetailsAccessibleName=Files Details
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=Anteprima
-ColorChooser.okText=OK
-ColorChooser.cancelText=Annulla
-ColorChooser.resetText=Reimposta
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=82
-ColorChooser.sampleText=Testo di prova          Testo di prova
-ColorChooser.swatchesNameText=Colori campione
-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
-# mnemonic is xxxMnemonic and the index of the character to underline is
-# xxxDisplayedMnemonicIndex.
-ColorChooser.hsvNameText=HSV
-ColorChooser.hsvMnemonic=72
-ColorChooser.hsvHueText=Tonalit\u00E0
-ColorChooser.hsvSaturationText=Saturazione
-ColorChooser.hsvValueText=Valore
-ColorChooser.hsvTransparencyText=Trasparenza
-ColorChooser.hslNameText=HSL
-ColorChooser.hslMnemonic=76
-ColorChooser.hslHueText=Tonalit\u00E0
-ColorChooser.hslSaturationText=Saturazione
-ColorChooser.hslLightnessText=Luminosit\u00E0
-ColorChooser.hslTransparencyText=Trasparenza
-ColorChooser.rgbNameText=RGB
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbRedText=Rosso
-ColorChooser.rgbRedMnemonic=83
-ColorChooser.rgbGreenText=Verde
-ColorChooser.rgbGreenMnemonic=68
-ColorChooser.rgbBlueText=Blu
-ColorChooser.rgbBlueMnemonic=66
-ColorChooser.rgbAlphaText=Alfa
-ColorChooser.rgbHexCodeText=Codice colori
-ColorChooser.rgbHexCodeMnemonic=67
-ColorChooser.cmykNameText=CMYK
-ColorChooser.cmykMnemonic=77
-ColorChooser.cmykCyanText=Ciano
-ColorChooser.cmykMagentaText=Magenta
-ColorChooser.cmykYellowText=Giallo
-ColorChooser.cmykBlackText=Nero
-ColorChooser.cmykAlphaText=Alfa
+ColorChooser.preview.textAndMnemonic=Anteprima
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Annulla
+ColorChooser.reset.textAndMnemonic=&Reimposta
+ColorChooser.sample.textAndMnemonic=Testo di prova          Testo di prova
+ColorChooser.swatches.textAndMnemonic=Colori cam&pione
+ColorChooser.swatchesRecent.textAndMnemonic=Recenti:
+ColorChooser.hsv.textAndMnemonic=&HSV
+ColorChooser.hsvHue.textAndMnemonic=Tonalit\u00E0
+ColorChooser.hsvSaturation.textAndMnemonic=Saturazione
+ColorChooser.hsvValue.textAndMnemonic=Valore
+ColorChooser.hsvTransparency.textAndMnemonic=Trasparenza
+ColorChooser.hsl.textAndMnemonic=HS&L
+ColorChooser.hslHue.textAndMnemonic=Tonalit\u00E0
+ColorChooser.hslSaturation.textAndMnemonic=Saturazione
+ColorChooser.hslLightness.textAndMnemonic=Luminosit\u00E0
+ColorChooser.hslTransparency.textAndMnemonic=Trasparenza
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=Ro&sso
+ColorChooser.rgbGreen.textAndMnemonic=Ver&de
+ColorChooser.rgbBlue.textAndMnemonic=&Blu
+ColorChooser.rgbAlpha.textAndMnemonic=Alfa
+ColorChooser.rgbHexCode.textAndMnemonic=&Codice colori
+ColorChooser.cmyk.textAndMnemonic=C&MYK
+ColorChooser.cmykCyan.textAndMnemonic=Ciano
+ColorChooser.cmykMagenta.textAndMnemonic=Magenta
+ColorChooser.cmykYellow.textAndMnemonic=Giallo
+ColorChooser.cmykBlack.textAndMnemonic=Nero
+ColorChooser.cmykAlpha.textAndMnemonic=Alfa
 
 ############ OPTION PANE STRINGS #############
-# 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=S\u00EC
-OptionPane.yesButtonMnemonic=83
-OptionPane.noButtonText=No
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
-OptionPane.okButtonMnemonic=O
-OptionPane.cancelButtonText=Annulla
-OptionPane.cancelButtonMnemonic=A
-OptionPane.titleText=Selezionare una opzione
+OptionPane.yesButton.textAndMnemonic=S\u00EC(&S)
+OptionPane.noButton.textAndMnemonic=&No
+OptionPane.okButton.textAndMnemonic=&OK
+OptionPane.cancelButton.textAndMnemonic=&Annulla
+OptionPane.title.textAndMnemonic=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.
-OptionPane.inputDialogTitle=Input
+OptionPane.inputDialog.titleAndMnemonic=Input
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=Messaggio
+OptionPane.messageDialog.titleAndMnemonic=Messaggio
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=Stampa in corso
-PrintingDialog.titleAbortingText=Stampa in corso (operazione interrotta)
+PrintingDialog.titleProgress.textAndMnemonic=Stampa in corso
+PrintingDialog.titleAborting.textAndMnemonic=Stampa in corso (operazione interrotta)
 
-PrintingDialog.contentInitialText=Stampa in corso...
+PrintingDialog.contentInitial.textAndMnemonic=Stampa in corso...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=Pagina stampata {0}...
+PrintingDialog.contentProgress.textAndMnemonic=Pagina stampata {0}...
 
-PrintingDialog.contentAbortingText=Interruzione della stampa...
+PrintingDialog.contentAborting.textAndMnemonic=Interruzione della stampa...
 
-PrintingDialog.abortButtonText=Interrompi
-PrintingDialog.abortButtonMnemonic=78
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=Interrompi la stampa
+PrintingDialog.abortButton.textAndMnemonic=I&nterrompi
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Interrompi la stampa
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=Riduci a icona
@@ -183,42 +140,42 @@ InternalFrame.restoreButtonToolTip=Ripristina
 InternalFrame.closeButtonToolTip=Chiudi
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=Ripristina
-InternalFrameTitlePane.moveButtonText=Sposta
-InternalFrameTitlePane.sizeButtonText=Dimensioni
-InternalFrameTitlePane.minimizeButtonText=Riduci a icona
-InternalFrameTitlePane.maximizeButtonText=Ingrandisci
-InternalFrameTitlePane.closeButtonText=Chiudi
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Ripristina
+InternalFrameTitlePane.moveButton.textAndMnemonic=Sposta
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Dimensioni
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Riduci a icona
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Ingrandisci
+InternalFrameTitlePane.closeButton.textAndMnemonic=Chiudi
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=Sottometti query
-FormView.resetButtonText=Reimposta
-FormView.browseFileButtonText=Sfoglia...
+FormView.submitButton.textAndMnemonic=Sottometti query
+FormView.resetButton.textAndMnemonic=Reimposta
+FormView.browseFileButton.textAndMnemonic=Sfoglia...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=modifica di stile
-AbstractDocument.additionText=aggiunta
-AbstractDocument.deletionText=eliminazione
-AbstractDocument.undoText=Annulla
-AbstractDocument.redoText=Ripeti
+AbstractDocument.styleChange.textAndMnemonic=modifica di stile
+AbstractDocument.addition.textAndMnemonic=aggiunta
+AbstractDocument.deletion.textAndMnemonic=eliminazione
+AbstractDocument.undo.textAndMnemonic=Annulla
+AbstractDocument.redo.textAndMnemonic=Ripeti
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=fare clic
+AbstractButton.click.textAndMnemonic=fare clic
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=Annulla
-AbstractUndoableEdit.redoText=Ripeti
+AbstractUndoableEdit.undo.textAndMnemonic=Annulla
+AbstractUndoableEdit.redo.textAndMnemonic=Ripeti
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=togglePopup
+ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=Avanzamento...
+ProgressMonitor.progress.textAndMnemonic=Avanzamento...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=tasto sinistro
-SplitPane.rightButtonText=tasto destro
+SplitPane.leftButton.textAndMnemonic=tasto sinistro
+SplitPane.rightButton.textAndMnemonic=tasto destro
 # Used for Isindex
 IsindexView.prompt=Questo \u00E8 un indice di ricerca. Immettere le parole chiave:
 

src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties

@@ -15,27 +15,12 @@
 #                        MNEMONIC NOTE:
 # Many of strings in this file are used by widgets that have a
 # mnemonic, for example:
-#   ColorChooser.rgbNameText=RGB
-#   ColorChooser.rgbMnemonic=71
-#   ColorChooser.rgbDisplayedMnemonicIndex=1
+#   ColorChooser.rgbNameTextAndMnemonic=R&GB
 # Indicates that the tab in the ColorChooser for RGB colors will have
 # the text 'RGB', further the mnemonic character will be 'g' and that
 # a decoration will be provided under the 'G'. This will typically
 # look like:  RGB
 #              -
-# 71 corresponds to the decimal value of the VK constant defined
-# in java/awt/KeyEvent.java. VK_G is defined as:
-#
-#    public static final int VK_G              = 0x47;
-#
-# 0x47 is a hex number and needs to be converted to decimal.
-# A simple way to calculate this for a-z is to add 64 to the index of
-# the letter in the alphabet. As 'a' is in the 1st letter the mnemonic
-# for 'a' is 65, 'b' is 66...
-#
-# The xxDisplayedMnemonicIndex is used to indicate the index of the
-# character that should be underlined in the String, with 0
-# corresponding to the first character in the String.
 #
 # One important thing to remember is that the mnemonic MUST exist in
 # the String, if it does not exist you should add text that makes it
@@ -45,30 +30,24 @@
 # @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.fileDescription.textAndMnemonic=\u6C4E\u7528\u30D5\u30A1\u30A4\u30EB
+FileChooser.directoryDescription.textAndMnemonic=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
+FileChooser.newFolderError.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210\u30A8\u30E9\u30FC
 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.acceptAllFileFilterText=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB
-FileChooser.cancelButtonText=\u53D6\u6D88
-FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=\u4FDD\u5B58
-FileChooser.saveButtonMnemonic=83
-FileChooser.openButtonText=\u958B\u304F
-FileChooser.openButtonMnemonic=79
-FileChooser.saveDialogTitleText=\u4FDD\u5B58
-FileChooser.openDialogTitleText=\u958B\u304F
-FileChooser.updateButtonText=\u66F4\u65B0(U)
-FileChooser.updateButtonMnemonic=85
-FileChooser.helpButtonText=\u30D8\u30EB\u30D7(H)
-FileChooser.helpButtonMnemonic=72
-FileChooser.directoryOpenButtonText=\u958B\u304F(O)
-FileChooser.directoryOpenButtonMnemonic=79
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=\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.renameErrorTitle.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30D5\u30A9\u30EB\u30C0\u306E\u540D\u524D\u5909\u66F4\u30A8\u30E9\u30FC
+FileChooser.renameError.textAndMnemonic={0}\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093
+FileChooser.renameErrorFileExists.textAndMnemonic={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.acceptAllFileFilter.textAndMnemonic=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB
+FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88(&C)
+FileChooser.saveButton.textAndMnemonic=\u4FDD\u5B58(&S)
+FileChooser.openButton.textAndMnemonic=\u958B\u304F(&O)
+FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
+FileChooser.openDialogTitle.textAndMnemonic=\u958B\u304F
+FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0(&U)
+FileChooser.helpButton.textAndMnemonic=\u30D8\u30EB\u30D7(&H)
+FileChooser.directoryOpenButton.textAndMnemonic=\u958B\u304F(&O)
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -83,98 +62,76 @@ FileChooser.other.newFolder.subsequent=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0.{0}
 
 
 ## file chooser tooltips ###
-FileChooser.cancelButtonToolTipText=\u30D5\u30A1\u30A4\u30EB\u30FB\u30C1\u30E5\u30FC\u30B6\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u7D42\u4E86\u3057\u307E\u3059
-FileChooser.saveButtonToolTipText=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3057\u307E\u3059
-FileChooser.openButtonToolTipText=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304D\u307E\u3059
-FileChooser.updateButtonToolTipText=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30EA\u30B9\u30C8\u3092\u66F4\u65B0\u3057\u307E\u3059
-FileChooser.helpButtonToolTipText=FileChooser\u306E\u30D8\u30EB\u30D7\u3067\u3059
-FileChooser.directoryOpenButtonToolTipText=\u9078\u629E\u3057\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u958B\u304D\u307E\u3059
+FileChooser.cancelButtonToolTip.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u30FB\u30C1\u30E5\u30FC\u30B6\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u7D42\u4E86\u3057\u307E\u3059
+FileChooser.saveButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3057\u307E\u3059
+FileChooser.openButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304D\u307E\u3059
+FileChooser.updateButtonToolTip.textAndMnemonic=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30EA\u30B9\u30C8\u3092\u66F4\u65B0\u3057\u307E\u3059
+FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser\u306E\u30D8\u30EB\u30D7\u3067\u3059
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u958B\u304D\u307E\u3059
 
 FileChooser.filesListAccessibleName=Files List
 FileChooser.filesDetailsAccessibleName=Files Details
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=\u30D7\u30EC\u30D3\u30E5\u30FC
-ColorChooser.okText=OK
-ColorChooser.cancelText=\u53D6\u6D88
-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(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.hsvMnemonic=72
-ColorChooser.hsvHueText=\u8272\u76F8
-ColorChooser.hsvSaturationText=\u5F69\u5EA6
-ColorChooser.hsvValueText=\u5024
-ColorChooser.hsvTransparencyText=\u900F\u660E\u5EA6
-ColorChooser.hslNameText=HSL
-ColorChooser.hslMnemonic=76
-ColorChooser.hslHueText=\u8272\u76F8
-ColorChooser.hslSaturationText=\u5F69\u5EA6
-ColorChooser.hslLightnessText=\u660E\u5EA6
-ColorChooser.hslTransparencyText=\u900F\u660E\u5EA6
-ColorChooser.rgbNameText=RGB
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbRedText=\u8D64
-ColorChooser.rgbRedMnemonic=68
-ColorChooser.rgbGreenText=\u7DD1
-ColorChooser.rgbGreenMnemonic=78
-ColorChooser.rgbBlueText=\u9752
-ColorChooser.rgbBlueMnemonic=66
-ColorChooser.rgbAlphaText=\u30A2\u30EB\u30D5\u30A1
-ColorChooser.rgbHexCodeText=\u8272\u30B3\u30FC\u30C9(C)
-ColorChooser.rgbHexCodeMnemonic=67
-ColorChooser.cmykNameText=CMYK
-ColorChooser.cmykMnemonic=77
-ColorChooser.cmykCyanText=\u30B7\u30A2\u30F3
-ColorChooser.cmykMagentaText=\u30DE\u30BC\u30F3\u30BF
-ColorChooser.cmykYellowText=\u9EC4
-ColorChooser.cmykBlackText=\u9ED2
-ColorChooser.cmykAlphaText=\u30A2\u30EB\u30D5\u30A1
+ColorChooser.preview.textAndMnemonic=\u30D7\u30EC\u30D3\u30E5\u30FC
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88
+ColorChooser.reset.textAndMnemonic=\u30EA\u30BB\u30C3\u30C8(&R)
+ColorChooser.sample.textAndMnemonic=\u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8  \u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8
+ColorChooser.swatches.textAndMnemonic=\u30B5\u30F3\u30D7\u30EB(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u65B0:
+ColorChooser.hsv.textAndMnemonic=&HSV
+ColorChooser.hsvHue.textAndMnemonic=\u8272\u76F8
+ColorChooser.hsvSaturation.textAndMnemonic=\u5F69\u5EA6
+ColorChooser.hsvValue.textAndMnemonic=\u5024
+ColorChooser.hsvTransparency.textAndMnemonic=\u900F\u660E\u5EA6
+ColorChooser.hsl.textAndMnemonic=HS&L
+ColorChooser.hslHue.textAndMnemonic=\u8272\u76F8
+ColorChooser.hslSaturation.textAndMnemonic=\u5F69\u5EA6
+ColorChooser.hslLightness.textAndMnemonic=\u660E\u5EA6
+ColorChooser.hslTransparency.textAndMnemonic=\u900F\u660E\u5EA6
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=\u8D64(&D)
+ColorChooser.rgbGreen.textAndMnemonic=\u7DD1(&N)
+ColorChooser.rgbBlue.textAndMnemonic=\u9752(&B)
+ColorChooser.rgbAlpha.textAndMnemonic=\u30A2\u30EB\u30D5\u30A1
+ColorChooser.rgbHexCode.textAndMnemonic=\u8272\u30B3\u30FC\u30C9(&C)
+ColorChooser.cmyk.textAndMnemonic=C&MYK
+ColorChooser.cmykCyan.textAndMnemonic=\u30B7\u30A2\u30F3
+ColorChooser.cmykMagenta.textAndMnemonic=\u30DE\u30BC\u30F3\u30BF
+ColorChooser.cmykYellow.textAndMnemonic=\u9EC4
+ColorChooser.cmykBlack.textAndMnemonic=\u9ED2
+ColorChooser.cmykAlpha.textAndMnemonic=\u30A2\u30EB\u30D5\u30A1
 
 ############ OPTION PANE STRINGS #############
-# 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(Y)
-OptionPane.yesButtonMnemonic=89
-OptionPane.noButtonText=\u3044\u3044\u3048(N)
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
-OptionPane.okButtonMnemonic=O
-OptionPane.cancelButtonText=\u53D6\u6D88
-OptionPane.cancelButtonMnemonic=0
-OptionPane.titleText=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u9078\u629E
+OptionPane.yesButton.textAndMnemonic=\u306F\u3044(&Y)
+OptionPane.noButton.textAndMnemonic=\u3044\u3044\u3048(&N)
+OptionPane.okButton.textAndMnemonic=&OK
+OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88
+OptionPane.title.textAndMnemonic=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u9078\u629E
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=\u5165\u529B
+OptionPane.inputDialog.titleAndMnemonic=\u5165\u529B
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=\u30E1\u30C3\u30BB\u30FC\u30B8
+OptionPane.messageDialog.titleAndMnemonic=\u30E1\u30C3\u30BB\u30FC\u30B8
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=\u5370\u5237\u3057\u3066\u3044\u307E\u3059
-PrintingDialog.titleAbortingText=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059
+PrintingDialog.titleProgress.textAndMnemonic=\u5370\u5237\u3057\u3066\u3044\u307E\u3059
+PrintingDialog.titleAborting.textAndMnemonic=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059
 
-PrintingDialog.contentInitialText=\u5370\u5237\u4E2D...
+PrintingDialog.contentInitial.textAndMnemonic=\u5370\u5237\u4E2D...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=\u30DA\u30FC\u30B8{0}\u3092\u5370\u5237\u3057\u307E\u3057\u305F...
+PrintingDialog.contentProgress.textAndMnemonic=\u30DA\u30FC\u30B8{0}\u3092\u5370\u5237\u3057\u307E\u3057\u305F...
 
-PrintingDialog.contentAbortingText=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059...
+PrintingDialog.contentAborting.textAndMnemonic=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059...
 
-PrintingDialog.abortButtonText=\u4E2D\u6B62(A)
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=\u5370\u5237\u306E\u4E2D\u6B62
+PrintingDialog.abortButton.textAndMnemonic=\u4E2D\u6B62(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=\u5370\u5237\u306E\u4E2D\u6B62
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316
@@ -183,42 +140,42 @@ InternalFrame.restoreButtonToolTip=\u5FA9\u5143
 InternalFrame.closeButtonToolTip=\u9589\u3058\u308B
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=\u5FA9\u5143
-InternalFrameTitlePane.moveButtonText=\u79FB\u52D5
-InternalFrameTitlePane.sizeButtonText=\u30B5\u30A4\u30BA
-InternalFrameTitlePane.minimizeButtonText=\u6700\u5C0F\u5316
-InternalFrameTitlePane.maximizeButtonText=\u6700\u5927\u5316
-InternalFrameTitlePane.closeButtonText=\u9589\u3058\u308B
+InternalFrameTitlePane.restoreButton.textAndMnemonic=\u5FA9\u5143
+InternalFrameTitlePane.moveButton.textAndMnemonic=\u79FB\u52D5
+InternalFrameTitlePane.sizeButton.textAndMnemonic=\u30B5\u30A4\u30BA
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=\u6700\u5C0F\u5316
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=\u6700\u5927\u5316
+InternalFrameTitlePane.closeButton.textAndMnemonic=\u9589\u3058\u308B
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=\u554F\u5408\u305B\u306E\u5B9F\u884C
-FormView.resetButtonText=\u30EA\u30BB\u30C3\u30C8
-FormView.browseFileButtonText=\u53C2\u7167...
+FormView.submitButton.textAndMnemonic=\u554F\u5408\u305B\u306E\u5B9F\u884C
+FormView.resetButton.textAndMnemonic=\u30EA\u30BB\u30C3\u30C8
+FormView.browseFileButton.textAndMnemonic=\u53C2\u7167...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=\u30B9\u30BF\u30A4\u30EB\u5909\u66F4
-AbstractDocument.additionText=\u8FFD\u52A0
-AbstractDocument.deletionText=\u524A\u9664
-AbstractDocument.undoText=\u5143\u306B\u623B\u3059
-AbstractDocument.redoText=\u3084\u308A\u76F4\u3057
+AbstractDocument.styleChange.textAndMnemonic=\u30B9\u30BF\u30A4\u30EB\u5909\u66F4
+AbstractDocument.addition.textAndMnemonic=\u8FFD\u52A0
+AbstractDocument.deletion.textAndMnemonic=\u524A\u9664
+AbstractDocument.undo.textAndMnemonic=\u5143\u306B\u623B\u3059
+AbstractDocument.redo.textAndMnemonic=\u3084\u308A\u76F4\u3057
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=\u30AF\u30EA\u30C3\u30AF
+AbstractButton.click.textAndMnemonic=\u30AF\u30EA\u30C3\u30AF
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=\u5143\u306B\u623B\u3059
-AbstractUndoableEdit.redoText=\u3084\u308A\u76F4\u3057
+AbstractUndoableEdit.undo.textAndMnemonic=\u5143\u306B\u623B\u3059
+AbstractUndoableEdit.redo.textAndMnemonic=\u3084\u308A\u76F4\u3057
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=\u30C8\u30B0\u30EB\u30FB\u30DD\u30C3\u30D7\u30A2\u30C3\u30D7
+ComboBox.togglePopup.textAndMnemonic=\u30C8\u30B0\u30EB\u30FB\u30DD\u30C3\u30D7\u30A2\u30C3\u30D7
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=\u9032\u884C\u4E2D...
+ProgressMonitor.progress.textAndMnemonic=\u9032\u884C\u4E2D...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=\u5DE6\u30DC\u30BF\u30F3
-SplitPane.rightButtonText=\u53F3\u30DC\u30BF\u30F3
+SplitPane.leftButton.textAndMnemonic=\u5DE6\u30DC\u30BF\u30F3
+SplitPane.rightButton.textAndMnemonic=\u53F3\u30DC\u30BF\u30F3
 # Used for Isindex
 IsindexView.prompt=\u691C\u7D22\u7528\u306E\u7D22\u5F15\u3067\u3059\u3002\u691C\u7D22\u3059\u308B\u30AD\u30FC\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044:
 

src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties

@@ -15,27 +15,12 @@
 #                        MNEMONIC NOTE:
 # Many of strings in this file are used by widgets that have a
 # mnemonic, for example:
-#   ColorChooser.rgbNameText=RGB
-#   ColorChooser.rgbMnemonic=71
-#   ColorChooser.rgbDisplayedMnemonicIndex=1
+#   ColorChooser.rgbNameTextAndMnemonic=R&GB
 # Indicates that the tab in the ColorChooser for RGB colors will have
 # the text 'RGB', further the mnemonic character will be 'g' and that
 # a decoration will be provided under the 'G'. This will typically
 # look like:  RGB
 #              -
-# 71 corresponds to the decimal value of the VK constant defined
-# in java/awt/KeyEvent.java. VK_G is defined as:
-#
-#    public static final int VK_G              = 0x47;
-#
-# 0x47 is a hex number and needs to be converted to decimal.
-# A simple way to calculate this for a-z is to add 64 to the index of
-# the letter in the alphabet. As 'a' is in the 1st letter the mnemonic
-# for 'a' is 65, 'b' is 66...
-#
-# The xxDisplayedMnemonicIndex is used to indicate the index of the
-# character that should be underlined in the String, with 0
-# corresponding to the first character in the String.
 #
 # One important thing to remember is that the mnemonic MUST exist in
 # the String, if it does not exist you should add text that makes it
@@ -45,30 +30,24 @@
 # @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.fileDescription.textAndMnemonic=\uC77C\uBC18 \uD30C\uC77C
+FileChooser.directoryDescription.textAndMnemonic=\uB514\uB809\uD1A0\uB9AC
+FileChooser.newFolderError.textAndMnemonic=\uC0C8 \uD3F4\uB354\uB97C \uC0DD\uC131\uD558\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
 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.acceptAllFileFilterText=\uBAA8\uB4E0 \uD30C\uC77C
-FileChooser.cancelButtonText=\uCDE8\uC18C
-FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=\uC800\uC7A5
-FileChooser.saveButtonMnemonic=83
-FileChooser.openButtonText=\uC5F4\uAE30
-FileChooser.openButtonMnemonic=79
-FileChooser.saveDialogTitleText=\uC800\uC7A5
-FileChooser.openDialogTitleText=\uC5F4\uAE30
-FileChooser.updateButtonText=\uAC31\uC2E0(U)
-FileChooser.updateButtonMnemonic=85
-FileChooser.helpButtonText=\uB3C4\uC6C0\uB9D0(H)
-FileChooser.helpButtonMnemonic=72
-FileChooser.directoryOpenButtonText=\uC5F4\uAE30(O)
-FileChooser.directoryOpenButtonMnemonic=79
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=\uD3F4\uB354\uB97C \uC0DD\uC131\uD560 \uC218 \uC5C6\uC74C
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=\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.renameErrorTitle.textAndMnemonic=\uD30C\uC77C \uB610\uB294 \uD3F4\uB354 \uC774\uB984 \uBC14\uAFB8\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD
+FileChooser.renameError.textAndMnemonic={0}\uC758 \uC774\uB984\uC744 \uBC14\uAFC0 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+FileChooser.renameErrorFileExists.textAndMnemonic={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.acceptAllFileFilter.textAndMnemonic=\uBAA8\uB4E0 \uD30C\uC77C
+FileChooser.cancelButton.textAndMnemonic=\uCDE8\uC18C(&C)
+FileChooser.saveButton.textAndMnemonic=\uC800\uC7A5(&S)
+FileChooser.openButton.textAndMnemonic=\uC5F4\uAE30(&O)
+FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5
+FileChooser.openDialogTitle.textAndMnemonic=\uC5F4\uAE30
+FileChooser.updateButton.textAndMnemonic=\uAC31\uC2E0(&U)
+FileChooser.helpButton.textAndMnemonic=\uB3C4\uC6C0\uB9D0(&H)
+FileChooser.directoryOpenButton.textAndMnemonic=\uC5F4\uAE30(&O)
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -83,98 +62,76 @@ FileChooser.other.newFolder.subsequent=NewFolder.{0}
 
 
 ## file chooser tooltips ###
-FileChooser.cancelButtonToolTipText=\uD30C\uC77C \uC120\uD0DD\uAE30 \uB300\uD654\uC0C1\uC790 \uC911\uB2E8
-FileChooser.saveButtonToolTipText=\uC120\uD0DD\uB41C \uD30C\uC77C \uC800\uC7A5
-FileChooser.openButtonToolTipText=\uC120\uD0DD\uB41C \uD30C\uC77C \uC5F4\uAE30
-FileChooser.updateButtonToolTipText=\uB514\uB809\uD1A0\uB9AC \uBAA9\uB85D \uAC31\uC2E0
-FileChooser.helpButtonToolTipText=FileChooser \uB3C4\uC6C0\uB9D0
-FileChooser.directoryOpenButtonToolTipText=\uC120\uD0DD\uB41C \uB514\uB809\uD1A0\uB9AC \uC5F4\uAE30
+FileChooser.cancelButtonToolTip.textAndMnemonic=\uD30C\uC77C \uC120\uD0DD\uAE30 \uB300\uD654\uC0C1\uC790 \uC911\uB2E8
+FileChooser.saveButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C \uC800\uC7A5
+FileChooser.openButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C \uC5F4\uAE30
+FileChooser.updateButtonToolTip.textAndMnemonic=\uB514\uB809\uD1A0\uB9AC \uBAA9\uB85D \uAC31\uC2E0
+FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser \uB3C4\uC6C0\uB9D0
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uB514\uB809\uD1A0\uB9AC \uC5F4\uAE30
 
 FileChooser.filesListAccessibleName=Files List
 FileChooser.filesDetailsAccessibleName=Files Details
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=\uBBF8\uB9AC\uBCF4\uAE30
-ColorChooser.okText=\uD655\uC778
-ColorChooser.cancelText=\uCDE8\uC18C
-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(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.hsvMnemonic=72
-ColorChooser.hsvHueText=\uC0C9\uC870
-ColorChooser.hsvSaturationText=\uCC44\uB3C4
-ColorChooser.hsvValueText=\uAC12
-ColorChooser.hsvTransparencyText=\uD22C\uBA85
-ColorChooser.hslNameText=HSL
-ColorChooser.hslMnemonic=76
-ColorChooser.hslHueText=\uC0C9\uC870
-ColorChooser.hslSaturationText=\uCC44\uB3C4
-ColorChooser.hslLightnessText=\uBC1D\uAE30
-ColorChooser.hslTransparencyText=\uD22C\uBA85
-ColorChooser.rgbNameText=RGB
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbRedText=\uBE68\uAC04\uC0C9
-ColorChooser.rgbRedMnemonic=68
-ColorChooser.rgbGreenText=\uB179\uC0C9
-ColorChooser.rgbGreenMnemonic=78
-ColorChooser.rgbBlueText=\uD30C\uB780\uC0C9
-ColorChooser.rgbBlueMnemonic=66
-ColorChooser.rgbAlphaText=\uC54C\uD30C
-ColorChooser.rgbHexCodeText=\uC0C9\uC0C1 \uCF54\uB4DC(C)
-ColorChooser.rgbHexCodeMnemonic=67
-ColorChooser.cmykNameText=CMYK
-ColorChooser.cmykMnemonic=77
-ColorChooser.cmykCyanText=\uCCAD\uB85D\uC0C9
-ColorChooser.cmykMagentaText=\uC9C4\uD64D\uC0C9
-ColorChooser.cmykYellowText=\uB178\uB780\uC0C9
-ColorChooser.cmykBlackText=\uAC80\uC815\uC0C9
-ColorChooser.cmykAlphaText=\uC54C\uD30C
+ColorChooser.preview.textAndMnemonic=\uBBF8\uB9AC\uBCF4\uAE30
+ColorChooser.ok.textAndMnemonic=\uD655\uC778
+ColorChooser.cancel.textAndMnemonic=\uCDE8\uC18C
+ColorChooser.reset.textAndMnemonic=\uC7AC\uC124\uC815(&R)
+ColorChooser.sample.textAndMnemonic=\uC0D8\uD50C \uD14D\uC2A4\uD2B8  \uC0D8\uD50C \uD14D\uC2A4\uD2B8
+ColorChooser.swatches.textAndMnemonic=\uACAC\uBCF8(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=\uCD5C\uADFC \uBAA9\uB85D:
+ColorChooser.hsv.textAndMnemonic=&HSV
+ColorChooser.hsvHue.textAndMnemonic=\uC0C9\uC870
+ColorChooser.hsvSaturation.textAndMnemonic=\uCC44\uB3C4
+ColorChooser.hsvValue.textAndMnemonic=\uAC12
+ColorChooser.hsvTransparency.textAndMnemonic=\uD22C\uBA85
+ColorChooser.hsl.textAndMnemonic=HS&L
+ColorChooser.hslHue.textAndMnemonic=\uC0C9\uC870
+ColorChooser.hslSaturation.textAndMnemonic=\uCC44\uB3C4
+ColorChooser.hslLightness.textAndMnemonic=\uBC1D\uAE30
+ColorChooser.hslTransparency.textAndMnemonic=\uD22C\uBA85
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=\uBE68\uAC04\uC0C9(&D)
+ColorChooser.rgbGreen.textAndMnemonic=\uB179\uC0C9(&N)
+ColorChooser.rgbBlue.textAndMnemonic=\uD30C\uB780\uC0C9(&B)
+ColorChooser.rgbAlpha.textAndMnemonic=\uC54C\uD30C
+ColorChooser.rgbHexCode.textAndMnemonic=\uC0C9\uC0C1 \uCF54\uB4DC(&C)
+ColorChooser.cmyk.textAndMnemonic=C&MYK
+ColorChooser.cmykCyan.textAndMnemonic=\uCCAD\uB85D\uC0C9
+ColorChooser.cmykMagenta.textAndMnemonic=\uC9C4\uD64D\uC0C9
+ColorChooser.cmykYellow.textAndMnemonic=\uB178\uB780\uC0C9
+ColorChooser.cmykBlack.textAndMnemonic=\uAC80\uC815\uC0C9
+ColorChooser.cmykAlpha.textAndMnemonic=\uC54C\uD30C
 
 ############ OPTION PANE STRINGS #############
-# 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(Y)
-OptionPane.yesButtonMnemonic=89
-OptionPane.noButtonText=\uC544\uB2C8\uC624(N)
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=\uD655\uC778
-OptionPane.okButtonMnemonic=O
-OptionPane.cancelButtonText=\uCDE8\uC18C
-OptionPane.cancelButtonMnemonic=0
-OptionPane.titleText=\uC635\uC158 \uC120\uD0DD
+OptionPane.yesButton.textAndMnemonic=\uC608(&Y)
+OptionPane.noButton.textAndMnemonic=\uC544\uB2C8\uC624(&N)
+OptionPane.okButton.textAndMnemonic=\uD655\uC778(&O)
+OptionPane.cancelButton.textAndMnemonic=\uCDE8\uC18C
+OptionPane.title.textAndMnemonic=\uC635\uC158 \uC120\uD0DD
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=\uC785\uB825
+OptionPane.inputDialog.titleAndMnemonic=\uC785\uB825
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=\uBA54\uC2DC\uC9C0
+OptionPane.messageDialog.titleAndMnemonic=\uBA54\uC2DC\uC9C0
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=\uC778\uC1C4
-PrintingDialog.titleAbortingText=\uC778\uC1C4(\uC911\uB2E8 \uC911)
+PrintingDialog.titleProgress.textAndMnemonic=\uC778\uC1C4
+PrintingDialog.titleAborting.textAndMnemonic=\uC778\uC1C4(\uC911\uB2E8 \uC911)
 
-PrintingDialog.contentInitialText=\uC778\uC1C4 \uC9C4\uD589 \uC911...
+PrintingDialog.contentInitial.textAndMnemonic=\uC778\uC1C4 \uC9C4\uD589 \uC911...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=\uC778\uC1C4\uB41C \uD398\uC774\uC9C0 {0}...
+PrintingDialog.contentProgress.textAndMnemonic=\uC778\uC1C4\uB41C \uD398\uC774\uC9C0 {0}...
 
-PrintingDialog.contentAbortingText=\uC778\uC1C4 \uC911\uB2E8 \uC911...
+PrintingDialog.contentAborting.textAndMnemonic=\uC778\uC1C4 \uC911\uB2E8 \uC911...
 
-PrintingDialog.abortButtonText=\uC911\uB2E8(A)
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=\uC778\uC1C4 \uC911\uB2E8
+PrintingDialog.abortButton.textAndMnemonic=\uC911\uB2E8(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=\uC778\uC1C4 \uC911\uB2E8
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=\uCD5C\uC18C\uD654
@@ -183,42 +140,42 @@ InternalFrame.restoreButtonToolTip=\uBCF5\uC6D0
 InternalFrame.closeButtonToolTip=\uB2EB\uAE30
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=\uBCF5\uC6D0
-InternalFrameTitlePane.moveButtonText=\uC774\uB3D9
-InternalFrameTitlePane.sizeButtonText=\uD06C\uAE30
-InternalFrameTitlePane.minimizeButtonText=\uCD5C\uC18C\uD654
-InternalFrameTitlePane.maximizeButtonText=\uCD5C\uB300\uD654
-InternalFrameTitlePane.closeButtonText=\uB2EB\uAE30
+InternalFrameTitlePane.restoreButton.textAndMnemonic=\uBCF5\uC6D0
+InternalFrameTitlePane.moveButton.textAndMnemonic=\uC774\uB3D9
+InternalFrameTitlePane.sizeButton.textAndMnemonic=\uD06C\uAE30
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=\uCD5C\uC18C\uD654
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=\uCD5C\uB300\uD654
+InternalFrameTitlePane.closeButton.textAndMnemonic=\uB2EB\uAE30
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=\uC9C8\uC758 \uC81C\uCD9C
-FormView.resetButtonText=\uC7AC\uC124\uC815
-FormView.browseFileButtonText=\uCC3E\uC544\uBCF4\uAE30...
+FormView.submitButton.textAndMnemonic=\uC9C8\uC758 \uC81C\uCD9C
+FormView.resetButton.textAndMnemonic=\uC7AC\uC124\uC815
+FormView.browseFileButton.textAndMnemonic=\uCC3E\uC544\uBCF4\uAE30...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=\uC2A4\uD0C0\uC77C \uBCC0\uACBD
-AbstractDocument.additionText=\uCD94\uAC00
-AbstractDocument.deletionText=\uC0AD\uC81C
-AbstractDocument.undoText=\uC2E4\uD589 \uCDE8\uC18C
-AbstractDocument.redoText=\uC7AC\uC2E4\uD589
+AbstractDocument.styleChange.textAndMnemonic=\uC2A4\uD0C0\uC77C \uBCC0\uACBD
+AbstractDocument.addition.textAndMnemonic=\uCD94\uAC00
+AbstractDocument.deletion.textAndMnemonic=\uC0AD\uC81C
+AbstractDocument.undo.textAndMnemonic=\uC2E4\uD589 \uCDE8\uC18C
+AbstractDocument.redo.textAndMnemonic=\uC7AC\uC2E4\uD589
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=\uB204\uB974\uAE30
+AbstractButton.click.textAndMnemonic=\uB204\uB974\uAE30
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=\uC2E4\uD589 \uCDE8\uC18C
-AbstractUndoableEdit.redoText=\uC7AC\uC2E4\uD589
+AbstractUndoableEdit.undo.textAndMnemonic=\uC2E4\uD589 \uCDE8\uC18C
+AbstractUndoableEdit.redo.textAndMnemonic=\uC7AC\uC2E4\uD589
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=togglePopup
+ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=\uC9C4\uD589...
+ProgressMonitor.progress.textAndMnemonic=\uC9C4\uD589...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=\uC67C\uCABD \uB2E8\uCD94
-SplitPane.rightButtonText=\uC624\uB978\uCABD \uB2E8\uCD94
+SplitPane.leftButton.textAndMnemonic=\uC67C\uCABD \uB2E8\uCD94
+SplitPane.rightButton.textAndMnemonic=\uC624\uB978\uCABD \uB2E8\uCD94
 # Used for Isindex
 IsindexView.prompt=\uB2E4\uC74C\uC740 \uAC80\uC0C9 \uAC00\uB2A5\uD55C \uC778\uB371\uC2A4\uC785\uB2C8\uB2E4. \uAC80\uC0C9 \uD0A4\uC6CC\uB4DC \uC785\uB825:
 

src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties

@@ -15,27 +15,12 @@
 #                        MNEMONIC NOTE:
 # Many of strings in this file are used by widgets that have a
 # mnemonic, for example:
-#   ColorChooser.rgbNameText=RGB
-#   ColorChooser.rgbMnemonic=71
-#   ColorChooser.rgbDisplayedMnemonicIndex=1
+#   ColorChooser.rgbNameTextAndMnemonic=R&GB
 # Indicates that the tab in the ColorChooser for RGB colors will have
 # the text 'RGB', further the mnemonic character will be 'g' and that
 # a decoration will be provided under the 'G'. This will typically
 # look like:  RGB
 #              -
-# 71 corresponds to the decimal value of the VK constant defined
-# in java/awt/KeyEvent.java. VK_G is defined as:
-#
-#    public static final int VK_G              = 0x47;
-#
-# 0x47 is a hex number and needs to be converted to decimal.
-# A simple way to calculate this for a-z is to add 64 to the index of
-# the letter in the alphabet. As 'a' is in the 1st letter the mnemonic
-# for 'a' is 65, 'b' is 66...
-#
-# The xxDisplayedMnemonicIndex is used to indicate the index of the
-# character that should be underlined in the String, with 0
-# corresponding to the first character in the String.
 #
 # One important thing to remember is that the mnemonic MUST exist in
 # the String, if it does not exist you should add text that makes it
@@ -45,30 +30,24 @@
 # @author Steve Wilson
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescriptionText=Arquivo Gen\u00E9rico
-FileChooser.directoryDescriptionText=Diret\u00F3rio
-FileChooser.newFolderErrorText=Erro ao criar nova pasta
+FileChooser.fileDescription.textAndMnemonic=Arquivo Gen\u00E9rico
+FileChooser.directoryDescription.textAndMnemonic=Diret\u00F3rio
+FileChooser.newFolderError.textAndMnemonic=Erro ao criar nova pasta
 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.acceptAllFileFilterText=Todos os Arquivos
-FileChooser.cancelButtonText=Cancelar
-FileChooser.cancelButtonMnemonic=67
-FileChooser.saveButtonText=Salvar
-FileChooser.saveButtonMnemonic=83
-FileChooser.openButtonText=Abrir
-FileChooser.openButtonMnemonic=66
-FileChooser.saveDialogTitleText=Salvar
-FileChooser.openDialogTitleText=Abrir
-FileChooser.updateButtonText=Atualizar
-FileChooser.updateButtonMnemonic=85
-FileChooser.helpButtonText=Ajuda
-FileChooser.helpButtonMnemonic=85
-FileChooser.directoryOpenButtonText=Abrir
-FileChooser.directoryOpenButtonMnemonic=66
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=N\u00E3o \u00E9 poss\u00EDvel criar a pasta
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=N\u00E3o \u00E9 poss\u00EDvel criar a pasta.\n\nO sistema n\u00E3o pode localizar o caminho especificado.
+FileChooser.renameErrorTitle.textAndMnemonic=Erro ao Renomear o Arquivo ou a Pasta
+FileChooser.renameError.textAndMnemonic=N\u00E3o \u00E9 poss\u00EDvel renomear {0}
+FileChooser.renameErrorFileExists.textAndMnemonic=N\u00E3o \u00E9 poss\u00EDvel renomear {0}: Um arquivo com o nome especificado j\u00E1 existe. Especifique outro nome de arquivo.
+FileChooser.acceptAllFileFilter.textAndMnemonic=Todos os Arquivos
+FileChooser.cancelButton.textAndMnemonic=&Cancelar
+FileChooser.saveButton.textAndMnemonic=&Salvar
+FileChooser.openButton.textAndMnemonic=A&brir
+FileChooser.saveDialogTitle.textAndMnemonic=Salvar
+FileChooser.openDialogTitle.textAndMnemonic=Abrir
+FileChooser.updateButton.textAndMnemonic=At&ualizar
+FileChooser.helpButton.textAndMnemonic=Aj&uda
+FileChooser.directoryOpenButton.textAndMnemonic=A&brir
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -83,98 +62,76 @@ FileChooser.other.newFolder.subsequent=NewFolder.{0}
 
 
 ## file chooser tooltips ###
-FileChooser.cancelButtonToolTipText=Abortar caixa de di\u00E1logo do seletor de arquivos
-FileChooser.saveButtonToolTipText=Salvar arquivo selecionado
-FileChooser.openButtonToolTipText=Abrir arquivo selecionado
-FileChooser.updateButtonToolTipText=Atualizar lista de diret\u00F3rios
-FileChooser.helpButtonToolTipText=Ajuda do FileChooser
-FileChooser.directoryOpenButtonToolTipText=Abrir diret\u00F3rio selecionado
+FileChooser.cancelButtonToolTip.textAndMnemonic=Abortar caixa de di\u00E1logo do seletor de arquivos
+FileChooser.saveButtonToolTip.textAndMnemonic=Salvar arquivo selecionado
+FileChooser.openButtonToolTip.textAndMnemonic=Abrir arquivo selecionado
+FileChooser.updateButtonToolTip.textAndMnemonic=Atualizar lista de diret\u00F3rios
+FileChooser.helpButtonToolTip.textAndMnemonic=Ajuda do FileChooser
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Abrir diret\u00F3rio selecionado
 
 FileChooser.filesListAccessibleName=Files List
 FileChooser.filesDetailsAccessibleName=Files Details
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=Visualizar
-ColorChooser.okText=OK
-ColorChooser.cancelText=Cancelar
-ColorChooser.resetText=Redefinir
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=82
-ColorChooser.sampleText=Texto de Amostra Texto de Amostra
-ColorChooser.swatchesNameText=Amostras
-ColorChooser.swatchesMnemonic=83
-ColorChooser.swatchesRecentText=Recente:
-# 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.hsvMnemonic=72
-ColorChooser.hsvHueText=Matiz
-ColorChooser.hsvSaturationText=Satura\u00E7\u00E3o
-ColorChooser.hsvValueText=Valor
-ColorChooser.hsvTransparencyText=Transpar\u00EAncia
-ColorChooser.hslNameText=HSL
-ColorChooser.hslMnemonic=76
-ColorChooser.hslHueText=Matiz
-ColorChooser.hslSaturationText=Satura\u00E7\u00E3o
-ColorChooser.hslLightnessText=Clareza
-ColorChooser.hslTransparencyText=Transpar\u00EAncia
-ColorChooser.rgbNameText=RGB
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbRedText=Vermelho
-ColorChooser.rgbRedMnemonic=86
-ColorChooser.rgbGreenText=Verde
-ColorChooser.rgbGreenMnemonic=86
-ColorChooser.rgbBlueText=Azul
-ColorChooser.rgbBlueMnemonic=65
-ColorChooser.rgbAlphaText=Alfa
-ColorChooser.rgbHexCodeText=C\u00F3digo da Cor
-ColorChooser.rgbHexCodeMnemonic=67
-ColorChooser.cmykNameText=CMYK
-ColorChooser.cmykMnemonic=77
-ColorChooser.cmykCyanText=Ciano
-ColorChooser.cmykMagentaText=Magenta
-ColorChooser.cmykYellowText=Amarelo
-ColorChooser.cmykBlackText=Preto
-ColorChooser.cmykAlphaText=Alfa
+ColorChooser.preview.textAndMnemonic=Visualizar
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Cancelar
+ColorChooser.reset.textAndMnemonic=&Redefinir
+ColorChooser.sample.textAndMnemonic=Texto de Amostra Texto de Amostra
+ColorChooser.swatches.textAndMnemonic=Amo&stras
+ColorChooser.swatchesRecent.textAndMnemonic=Recente:
+ColorChooser.hsv.textAndMnemonic=&HSV
+ColorChooser.hsvHue.textAndMnemonic=Matiz
+ColorChooser.hsvSaturation.textAndMnemonic=Satura\u00E7\u00E3o
+ColorChooser.hsvValue.textAndMnemonic=Valor
+ColorChooser.hsvTransparency.textAndMnemonic=Transpar\u00EAncia
+ColorChooser.hsl.textAndMnemonic=HS&L
+ColorChooser.hslHue.textAndMnemonic=Matiz
+ColorChooser.hslSaturation.textAndMnemonic=Satura\u00E7\u00E3o
+ColorChooser.hslLightness.textAndMnemonic=Clareza
+ColorChooser.hslTransparency.textAndMnemonic=Transpar\u00EAncia
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=&Vermelho
+ColorChooser.rgbGreen.textAndMnemonic=&Verde
+ColorChooser.rgbBlue.textAndMnemonic=&Azul
+ColorChooser.rgbAlpha.textAndMnemonic=Alfa
+ColorChooser.rgbHexCode.textAndMnemonic=C\u00F3digo da Cor(&C)
+ColorChooser.cmyk.textAndMnemonic=C&MYK
+ColorChooser.cmykCyan.textAndMnemonic=Ciano
+ColorChooser.cmykMagenta.textAndMnemonic=Magenta
+ColorChooser.cmykYellow.textAndMnemonic=Amarelo
+ColorChooser.cmykBlack.textAndMnemonic=Preto
+ColorChooser.cmykAlpha.textAndMnemonic=Alfa
 
 ############ OPTION PANE STRINGS #############
-# 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=Sim
-OptionPane.yesButtonMnemonic=83
-OptionPane.noButtonText=N\u00E3o
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
-OptionPane.okButtonMnemonic=O
-OptionPane.cancelButtonText=Cancelar
-OptionPane.cancelButtonMnemonic=C
-OptionPane.titleText=Selecionar uma Op\u00E7\u00E3o
+OptionPane.yesButton.textAndMnemonic=&Sim
+OptionPane.noButton.textAndMnemonic=N\u00E3o(&N)
+OptionPane.okButton.textAndMnemonic=&OK
+OptionPane.cancelButton.textAndMnemonic=&Cancelar
+OptionPane.title.textAndMnemonic=Selecionar uma Op\u00E7\u00E3o
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=Entrada
+OptionPane.inputDialog.titleAndMnemonic=Entrada
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=Mensagem
+OptionPane.messageDialog.titleAndMnemonic=Mensagem
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=Impress\u00E3o
-PrintingDialog.titleAbortingText=Impress\u00E3o (Abortando)
+PrintingDialog.titleProgress.textAndMnemonic=Impress\u00E3o
+PrintingDialog.titleAborting.textAndMnemonic=Impress\u00E3o (Abortando)
 
-PrintingDialog.contentInitialText=Impress\u00E3o em andamento...
+PrintingDialog.contentInitial.textAndMnemonic=Impress\u00E3o em andamento...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=P\u00E1gina impressa {0}...
+PrintingDialog.contentProgress.textAndMnemonic=P\u00E1gina impressa {0}...
 
-PrintingDialog.contentAbortingText=Abortando impress\u00E3o...
+PrintingDialog.contentAborting.textAndMnemonic=Abortando impress\u00E3o...
 
-PrintingDialog.abortButtonText=Abortar
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=Abortar Impress\u00E3o
+PrintingDialog.abortButton.textAndMnemonic=&Abortar
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Abortar Impress\u00E3o
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=Minimizar
@@ -183,42 +140,42 @@ InternalFrame.restoreButtonToolTip=Restaurar
 InternalFrame.closeButtonToolTip=Fechar
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=Restaurar
-InternalFrameTitlePane.moveButtonText=Mover
-InternalFrameTitlePane.sizeButtonText=Tamanho
-InternalFrameTitlePane.minimizeButtonText=Minimizar
-InternalFrameTitlePane.maximizeButtonText=Maximizar
-InternalFrameTitlePane.closeButtonText=Fechar
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Restaurar
+InternalFrameTitlePane.moveButton.textAndMnemonic=Mover
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Tamanho
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimizar
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximizar
+InternalFrameTitlePane.closeButton.textAndMnemonic=Fechar
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=Submeter Consulta
-FormView.resetButtonText=Redefinir
-FormView.browseFileButtonText=Procurar...
+FormView.submitButton.textAndMnemonic=Submeter Consulta
+FormView.resetButton.textAndMnemonic=Redefinir
+FormView.browseFileButton.textAndMnemonic=Procurar...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=altera\u00E7\u00E3o de estilo
-AbstractDocument.additionText=adi\u00E7\u00E3o
-AbstractDocument.deletionText=dele\u00E7\u00E3o
-AbstractDocument.undoText=Desfazer
-AbstractDocument.redoText=Refazer
+AbstractDocument.styleChange.textAndMnemonic=altera\u00E7\u00E3o de estilo
+AbstractDocument.addition.textAndMnemonic=adi\u00E7\u00E3o
+AbstractDocument.deletion.textAndMnemonic=dele\u00E7\u00E3o
+AbstractDocument.undo.textAndMnemonic=Desfazer
+AbstractDocument.redo.textAndMnemonic=Refazer
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=clicar
+AbstractButton.click.textAndMnemonic=clicar
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=Desfazer
-AbstractUndoableEdit.redoText=Refazer
+AbstractUndoableEdit.undo.textAndMnemonic=Desfazer
+AbstractUndoableEdit.redo.textAndMnemonic=Refazer
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=togglePopup
+ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=Progresso...
+ProgressMonitor.progress.textAndMnemonic=Progresso...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=bot\u00E3o esquerdo
-SplitPane.rightButtonText=bot\u00E3o direito
+SplitPane.leftButton.textAndMnemonic=bot\u00E3o esquerdo
+SplitPane.rightButton.textAndMnemonic=bot\u00E3o direito
 # Used for Isindex
 IsindexView.prompt=Trata-se de um \u00EDndice pesquis\u00E1vel. Informe as palavras-chave de pesquisa:
 

src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties

@@ -15,27 +15,12 @@
 #                        MNEMONIC NOTE:
 # Many of strings in this file are used by widgets that have a
 # mnemonic, for example:
-#   ColorChooser.rgbNameText=RGB
-#   ColorChooser.rgbMnemonic=71
-#   ColorChooser.rgbDisplayedMnemonicIndex=1
+#   ColorChooser.rgbNameTextAndMnemonic=R&GB
 # Indicates that the tab in the ColorChooser for RGB colors will have
 # the text 'RGB', further the mnemonic character will be 'g' and that
 # a decoration will be provided under the 'G'. This will typically
 # look like:  RGB
 #              -
-# 71 corresponds to the decimal value of the VK constant defined
-# in java/awt/KeyEvent.java. VK_G is defined as:
-#
-#    public static final int VK_G              = 0x47;
-#
-# 0x47 is a hex number and needs to be converted to decimal.
-# A simple way to calculate this for a-z is to add 64 to the index of
-# the letter in the alphabet. As 'a' is in the 1st letter the mnemonic
-# for 'a' is 65, 'b' is 66...
-#
-# The xxDisplayedMnemonicIndex is used to indicate the index of the
-# character that should be underlined in the String, with 0
-# corresponding to the first character in the String.
 #
 # One important thing to remember is that the mnemonic MUST exist in
 # the String, if it does not exist you should add text that makes it
@@ -45,30 +30,24 @@
 # @author Steve Wilson
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescriptionText=Generisk fil
-FileChooser.directoryDescriptionText=Katalog
-FileChooser.newFolderErrorText=Fel uppstod n\u00E4r ny mapp skapades
+FileChooser.fileDescription.textAndMnemonic=Generisk fil
+FileChooser.directoryDescription.textAndMnemonic=Katalog
+FileChooser.newFolderError.textAndMnemonic=Fel uppstod n\u00E4r ny mapp skapades
 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.acceptAllFileFilterText=Alla filer
-FileChooser.cancelButtonText=Avbryt
-FileChooser.cancelButtonMnemonic=65
-FileChooser.saveButtonText=Spara
-FileChooser.saveButtonMnemonic=83
-FileChooser.openButtonText=\u00D6ppna
-FileChooser.openButtonMnemonic=80
-FileChooser.saveDialogTitleText=Spara
-FileChooser.openDialogTitleText=\u00D6ppna
-FileChooser.updateButtonText=Uppdatera
-FileChooser.updateButtonMnemonic=68
-FileChooser.helpButtonText=Hj\u00E4lp
-FileChooser.helpButtonMnemonic=72
-FileChooser.directoryOpenButtonText=\u00D6ppna
-FileChooser.directoryOpenButtonMnemonic=80
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=Kan inte skapa mappen
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=Kan inte skapa mappen.\n\nSystemet kan inte hitta angiven s\u00F6kv\u00E4g.
+FileChooser.renameErrorTitle.textAndMnemonic=Ett fel intr\u00E4ffade vid f\u00F6rs\u00F6k att \u00E4ndra namn p\u00E5 fil eller mapp
+FileChooser.renameError.textAndMnemonic=Kan inte namn\u00E4ndra {0}
+FileChooser.renameErrorFileExists.textAndMnemonic=Kan inte namn\u00E4ndra {0}: En fil med angivet namn finns redan. Ange ett annat filnamn.
+FileChooser.acceptAllFileFilter.textAndMnemonic=Alla filer
+FileChooser.cancelButton.textAndMnemonic=&Avbryt
+FileChooser.saveButton.textAndMnemonic=&Spara
+FileChooser.openButton.textAndMnemonic=\u00D6ppna(&P)
+FileChooser.saveDialogTitle.textAndMnemonic=Spara
+FileChooser.openDialogTitle.textAndMnemonic=\u00D6ppna
+FileChooser.updateButton.textAndMnemonic=Upp&datera
+FileChooser.helpButton.textAndMnemonic=Hj\u00E4lp(&H)
+FileChooser.directoryOpenButton.textAndMnemonic=\u00D6ppna(&P)
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -83,98 +62,76 @@ FileChooser.other.newFolder.subsequent=Ny mapp.{0}
 
 
 ## file chooser tooltips ###
-FileChooser.cancelButtonToolTipText=Avbryt filvalsdialogruta
-FileChooser.saveButtonToolTipText=Spara vald fil
-FileChooser.openButtonToolTipText=\u00D6ppna vald fil
-FileChooser.updateButtonToolTipText=Uppdatera kataloglistan
-FileChooser.helpButtonToolTipText=Hj\u00E4lp - Filv\u00E4ljare
-FileChooser.directoryOpenButtonToolTipText=\u00D6ppna vald katalog
+FileChooser.cancelButtonToolTip.textAndMnemonic=Avbryt filvalsdialogruta
+FileChooser.saveButtonToolTip.textAndMnemonic=Spara vald fil
+FileChooser.openButtonToolTip.textAndMnemonic=\u00D6ppna vald fil
+FileChooser.updateButtonToolTip.textAndMnemonic=Uppdatera kataloglistan
+FileChooser.helpButtonToolTip.textAndMnemonic=Hj\u00E4lp - Filv\u00E4ljare
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u00D6ppna vald katalog
 
 FileChooser.filesListAccessibleName=Files List
 FileChooser.filesDetailsAccessibleName=Files Details
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=Granska
-ColorChooser.okText=OK
-ColorChooser.cancelText=Avbryt
-ColorChooser.resetText=\u00C5terst\u00E4ll
-# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic
-ColorChooser.resetMnemonic=84
-ColorChooser.sampleText=Exempeltext  Exempeltext
-ColorChooser.swatchesNameText=Prov
-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
-# mnemonic is xxxMnemonic and the index of the character to underline is
-# xxxDisplayedMnemonicIndex.
-ColorChooser.hsvNameText=HSV
-ColorChooser.hsvMnemonic=72
-ColorChooser.hsvHueText=Nyans
-ColorChooser.hsvSaturationText=M\u00E4ttnad
-ColorChooser.hsvValueText=V\u00E4rde
-ColorChooser.hsvTransparencyText=Transparens
-ColorChooser.hslNameText=HSL
-ColorChooser.hslMnemonic=76
-ColorChooser.hslHueText=Nyans
-ColorChooser.hslSaturationText=M\u00E4ttnad
-ColorChooser.hslLightnessText=Ljusstyrka
-ColorChooser.hslTransparencyText=Transparens
-ColorChooser.rgbNameText=RGB
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbRedText=R\u00F6d
-ColorChooser.rgbRedMnemonic=68
-ColorChooser.rgbGreenText=Gr\u00F6n
-ColorChooser.rgbGreenMnemonic=78
-ColorChooser.rgbBlueText=Bl\u00E5
-ColorChooser.rgbBlueMnemonic=66
-ColorChooser.rgbAlphaText=Alfa
-ColorChooser.rgbHexCodeText=F\u00E4rgkod
-ColorChooser.rgbHexCodeMnemonic=70
-ColorChooser.cmykNameText=CMYK
-ColorChooser.cmykMnemonic=77
-ColorChooser.cmykCyanText=Cyan
-ColorChooser.cmykMagentaText=Magenta
-ColorChooser.cmykYellowText=Gul
-ColorChooser.cmykBlackText=Svart
-ColorChooser.cmykAlphaText=Alfa
+ColorChooser.preview.textAndMnemonic=Granska
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Avbryt
+ColorChooser.reset.textAndMnemonic=\u00C5terst\u00E4ll(&T)
+ColorChooser.sample.textAndMnemonic=Exempeltext  Exempeltext
+ColorChooser.swatches.textAndMnemonic=&Prov
+ColorChooser.swatchesRecent.textAndMnemonic=Senaste:
+ColorChooser.hsv.textAndMnemonic=&HSV
+ColorChooser.hsvHue.textAndMnemonic=Nyans
+ColorChooser.hsvSaturation.textAndMnemonic=M\u00E4ttnad
+ColorChooser.hsvValue.textAndMnemonic=V\u00E4rde
+ColorChooser.hsvTransparency.textAndMnemonic=Transparens
+ColorChooser.hsl.textAndMnemonic=HS&L
+ColorChooser.hslHue.textAndMnemonic=Nyans
+ColorChooser.hslSaturation.textAndMnemonic=M\u00E4ttnad
+ColorChooser.hslLightness.textAndMnemonic=Ljusstyrka
+ColorChooser.hslTransparency.textAndMnemonic=Transparens
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=R\u00F6d(&D)
+ColorChooser.rgbGreen.textAndMnemonic=Gr\u00F6n(&N)
+ColorChooser.rgbBlue.textAndMnemonic=Bl\u00E5(&B)
+ColorChooser.rgbAlpha.textAndMnemonic=Alfa
+ColorChooser.rgbHexCode.textAndMnemonic=F\u00E4rgkod(&F)
+ColorChooser.cmyk.textAndMnemonic=C&MYK
+ColorChooser.cmykCyan.textAndMnemonic=Cyan
+ColorChooser.cmykMagenta.textAndMnemonic=Magenta
+ColorChooser.cmykYellow.textAndMnemonic=Gul
+ColorChooser.cmykBlack.textAndMnemonic=Svart
+ColorChooser.cmykAlpha.textAndMnemonic=Alfa
 
 ############ OPTION PANE STRINGS #############
-# 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=Ja
-OptionPane.yesButtonMnemonic=74
-OptionPane.noButtonText=Nej
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=OK
-OptionPane.okButtonMnemonic=O
-OptionPane.cancelButtonText=Avbryt
-OptionPane.cancelButtonMnemonic=A
-OptionPane.titleText=V\u00E4lj ett alternativ
+OptionPane.yesButton.textAndMnemonic=&Ja
+OptionPane.noButton.textAndMnemonic=&Nej
+OptionPane.okButton.textAndMnemonic=&OK
+OptionPane.cancelButton.textAndMnemonic=&Avbryt
+OptionPane.title.textAndMnemonic=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.
-OptionPane.inputDialogTitle=Indata
+OptionPane.inputDialog.titleAndMnemonic=Indata
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=Meddelande
+OptionPane.messageDialog.titleAndMnemonic=Meddelande
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=Skriver ut
-PrintingDialog.titleAbortingText=Skriver ut (avbryter)
+PrintingDialog.titleProgress.textAndMnemonic=Skriver ut
+PrintingDialog.titleAborting.textAndMnemonic=Skriver ut (avbryter)
 
-PrintingDialog.contentInitialText=Utskrift p\u00E5g\u00E5r...
+PrintingDialog.contentInitial.textAndMnemonic=Utskrift p\u00E5g\u00E5r...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=Utskriven sida {0}...
+PrintingDialog.contentProgress.textAndMnemonic=Utskriven sida {0}...
 
-PrintingDialog.contentAbortingText=Utskriften avbryts...
+PrintingDialog.contentAborting.textAndMnemonic=Utskriften avbryts...
 
-PrintingDialog.abortButtonText=Avbryt
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=Avbryt utskrift
+PrintingDialog.abortButton.textAndMnemonic=&Avbryt
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Avbryt utskrift
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=Minimera
@@ -183,42 +140,42 @@ InternalFrame.restoreButtonToolTip=\u00C5terst\u00E4ll
 InternalFrame.closeButtonToolTip=St\u00E4ng
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=\u00C5terst\u00E4ll
-InternalFrameTitlePane.moveButtonText=Flytta
-InternalFrameTitlePane.sizeButtonText=Storlek
-InternalFrameTitlePane.minimizeButtonText=Minimera
-InternalFrameTitlePane.maximizeButtonText=Maximera
-InternalFrameTitlePane.closeButtonText=St\u00E4ng
+InternalFrameTitlePane.restoreButton.textAndMnemonic=\u00C5terst\u00E4ll
+InternalFrameTitlePane.moveButton.textAndMnemonic=Flytta
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Storlek
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimera
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximera
+InternalFrameTitlePane.closeButton.textAndMnemonic=St\u00E4ng
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=Skicka fr\u00E5ga
-FormView.resetButtonText=\u00C5terst\u00E4ll
-FormView.browseFileButtonText=Bl\u00E4ddra...
+FormView.submitButton.textAndMnemonic=Skicka fr\u00E5ga
+FormView.resetButton.textAndMnemonic=\u00C5terst\u00E4ll
+FormView.browseFileButton.textAndMnemonic=Bl\u00E4ddra...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=format\u00E4ndring
-AbstractDocument.additionText=till\u00E4gg
-AbstractDocument.deletionText=borttagning
-AbstractDocument.undoText=\u00C5ngra
-AbstractDocument.redoText=G\u00F6r om
+AbstractDocument.styleChange.textAndMnemonic=format\u00E4ndring
+AbstractDocument.addition.textAndMnemonic=till\u00E4gg
+AbstractDocument.deletion.textAndMnemonic=borttagning
+AbstractDocument.undo.textAndMnemonic=\u00C5ngra
+AbstractDocument.redo.textAndMnemonic=G\u00F6r om
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=klicka
+AbstractButton.click.textAndMnemonic=klicka
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=\u00C5ngra
-AbstractUndoableEdit.redoText=G\u00F6r om
+AbstractUndoableEdit.undo.textAndMnemonic=\u00C5ngra
+AbstractUndoableEdit.redo.textAndMnemonic=G\u00F6r om
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=v\u00E4xlaPopup
+ComboBox.togglePopup.textAndMnemonic=v\u00E4xlaPopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=P\u00E5g\u00E5r...
+ProgressMonitor.progress.textAndMnemonic=P\u00E5g\u00E5r...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=v\u00E4nster knapp
-SplitPane.rightButtonText=h\u00F6ger knapp
+SplitPane.leftButton.textAndMnemonic=v\u00E4nster knapp
+SplitPane.rightButton.textAndMnemonic=h\u00F6ger knapp
 # Used for Isindex
 IsindexView.prompt=Detta \u00E4r ett s\u00F6kbart index. Ange s\u00F6kord:
 

src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties

@@ -15,27 +15,12 @@
 #                        MNEMONIC NOTE:
 # Many of strings in this file are used by widgets that have a
 # mnemonic, for example:
-#   ColorChooser.rgbNameText=RGB
-#   ColorChooser.rgbMnemonic=71
-#   ColorChooser.rgbDisplayedMnemonicIndex=1
+#   ColorChooser.rgbNameTextAndMnemonic=R&GB
 # Indicates that the tab in the ColorChooser for RGB colors will have
 # the text 'RGB', further the mnemonic character will be 'g' and that
 # a decoration will be provided under the 'G'. This will typically
 # look like:  RGB
 #              -
-# 71 corresponds to the decimal value of the VK constant defined
-# in java/awt/KeyEvent.java. VK_G is defined as:
-#
-#    public static final int VK_G              = 0x47;
-#
-# 0x47 is a hex number and needs to be converted to decimal.
-# A simple way to calculate this for a-z is to add 64 to the index of
-# the letter in the alphabet. As 'a' is in the 1st letter the mnemonic
-# for 'a' is 65, 'b' is 66...
-#
-# The xxDisplayedMnemonicIndex is used to indicate the index of the
-# character that should be underlined in the String, with 0
-# corresponding to the first character in the String.
 #
 # One important thing to remember is that the mnemonic MUST exist in
 # the String, if it does not exist you should add text that makes it
@@ -45,30 +30,24 @@
 # @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.fileDescription.textAndMnemonic=\u666E\u901A\u7684\u6587\u4EF6
+FileChooser.directoryDescription.textAndMnemonic=\u76EE\u5F55
+FileChooser.newFolderError.textAndMnemonic=\u521B\u5EFA\u65B0\u7684\u6587\u4EF6\u5939\u65F6\u51FA\u9519
 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.cancelButtonMnemonic=67
-FileChooser.saveButtonText=\u4FDD\u5B58
-FileChooser.saveButtonMnemonic=83
-FileChooser.openButtonText=\u6253\u5F00
-FileChooser.openButtonMnemonic=79
-FileChooser.saveDialogTitleText=\u4FDD\u5B58
-FileChooser.openDialogTitleText=\u6253\u5F00
-FileChooser.updateButtonText=\u66F4\u65B0(U)
-FileChooser.updateButtonMnemonic=85
-FileChooser.helpButtonText=\u5E2E\u52A9(H)
-FileChooser.helpButtonMnemonic=72
-FileChooser.directoryOpenButtonText=\u6253\u5F00(O)
-FileChooser.directoryOpenButtonMnemonic=79
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=\u65E0\u6CD5\u521B\u5EFA\u6587\u4EF6\u5939
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=\u65E0\u6CD5\u521B\u5EFA\u6587\u4EF6\u5939\u3002\n\n\u7CFB\u7EDF\u627E\u4E0D\u5230\u6307\u5B9A\u7684\u8DEF\u5F84\u3002
+FileChooser.renameErrorTitle.textAndMnemonic=\u91CD\u547D\u540D\u6587\u4EF6\u6216\u6587\u4EF6\u5939\u65F6\u51FA\u9519
+FileChooser.renameError.textAndMnemonic=\u65E0\u6CD5\u91CD\u547D\u540D{0}
+FileChooser.renameErrorFileExists.textAndMnemonic=\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.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6587\u4EF6
+FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88(&C)
+FileChooser.saveButton.textAndMnemonic=\u4FDD\u5B58(&S)
+FileChooser.openButton.textAndMnemonic=\u6253\u5F00(&O)
+FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
+FileChooser.openDialogTitle.textAndMnemonic=\u6253\u5F00
+FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0(&U)
+FileChooser.helpButton.textAndMnemonic=\u5E2E\u52A9(&H)
+FileChooser.directoryOpenButton.textAndMnemonic=\u6253\u5F00(&O)
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -83,98 +62,76 @@ FileChooser.other.newFolder.subsequent=NewFolder.{0}
 
 
 ## file chooser tooltips ###
-FileChooser.cancelButtonToolTipText=\u4E2D\u6B62\u6587\u4EF6\u9009\u62E9\u5668\u5BF9\u8BDD\u6846
-FileChooser.saveButtonToolTipText=\u4FDD\u5B58\u6240\u9009\u6587\u4EF6
-FileChooser.openButtonToolTipText=\u6253\u5F00\u6240\u9009\u6587\u4EF6
-FileChooser.updateButtonToolTipText=\u66F4\u65B0\u76EE\u5F55\u5217\u8868
-FileChooser.helpButtonToolTipText=FileChooser \u5E2E\u52A9
-FileChooser.directoryOpenButtonToolTipText=\u6253\u5F00\u9009\u62E9\u7684\u76EE\u5F55
+FileChooser.cancelButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6587\u4EF6\u9009\u62E9\u5668\u5BF9\u8BDD\u6846
+FileChooser.saveButtonToolTip.textAndMnemonic=\u4FDD\u5B58\u6240\u9009\u6587\u4EF6
+FileChooser.openButtonToolTip.textAndMnemonic=\u6253\u5F00\u6240\u9009\u6587\u4EF6
+FileChooser.updateButtonToolTip.textAndMnemonic=\u66F4\u65B0\u76EE\u5F55\u5217\u8868
+FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser \u5E2E\u52A9
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u6253\u5F00\u9009\u62E9\u7684\u76EE\u5F55
 
 FileChooser.filesListAccessibleName=Files List
 FileChooser.filesDetailsAccessibleName=Files Details
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=\u9884\u89C8
-ColorChooser.okText=\u786E\u5B9A
-ColorChooser.cancelText=\u53D6\u6D88
-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(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.hsvMnemonic=72
-ColorChooser.hsvHueText=\u8272\u8C03
-ColorChooser.hsvSaturationText=\u9971\u548C\u5EA6
-ColorChooser.hsvValueText=\u503C
-ColorChooser.hsvTransparencyText=\u900F\u660E\u5EA6
-ColorChooser.hslNameText=HSL
-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.rgbMnemonic=71
-ColorChooser.rgbRedText=\u7EA2\u8272
-ColorChooser.rgbRedMnemonic=68
-ColorChooser.rgbGreenText=\u7EFF\u8272
-ColorChooser.rgbGreenMnemonic=78
-ColorChooser.rgbBlueText=\u84DD\u8272
-ColorChooser.rgbBlueMnemonic=66
-ColorChooser.rgbAlphaText=Alpha
-ColorChooser.rgbHexCodeText=\u989C\u8272\u4EE3\u7801(C)
-ColorChooser.rgbHexCodeMnemonic=67
-ColorChooser.cmykNameText=CMYK
-ColorChooser.cmykMnemonic=77
-ColorChooser.cmykCyanText=\u9752\u8272
-ColorChooser.cmykMagentaText=\u7D2B\u7EA2\u8272
-ColorChooser.cmykYellowText=\u9EC4\u8272
-ColorChooser.cmykBlackText=\u9ED1\u8272
-ColorChooser.cmykAlphaText=Alpha
+ColorChooser.preview.textAndMnemonic=\u9884\u89C8
+ColorChooser.ok.textAndMnemonic=\u786E\u5B9A
+ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88
+ColorChooser.reset.textAndMnemonic=\u91CD\u7F6E(&R)
+ColorChooser.sample.textAndMnemonic=\u793A\u4F8B\u6587\u672C  \u793A\u4F8B\u6587\u672C
+ColorChooser.swatches.textAndMnemonic=\u793A\u4F8B(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u8FD1:
+ColorChooser.hsv.textAndMnemonic=&HSV
+ColorChooser.hsvHue.textAndMnemonic=\u8272\u8C03
+ColorChooser.hsvSaturation.textAndMnemonic=\u9971\u548C\u5EA6
+ColorChooser.hsvValue.textAndMnemonic=\u503C
+ColorChooser.hsvTransparency.textAndMnemonic=\u900F\u660E\u5EA6
+ColorChooser.hsl.textAndMnemonic=HS&L
+ColorChooser.hslHue.textAndMnemonic=\u8272\u8C03
+ColorChooser.hslSaturation.textAndMnemonic=\u9971\u548C\u5EA6
+ColorChooser.hslLightness.textAndMnemonic=\u4EAE\u5EA6
+ColorChooser.hslTransparency.textAndMnemonic=\u900F\u660E\u5EA6
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=\u7EA2\u8272(&D)
+ColorChooser.rgbGreen.textAndMnemonic=\u7EFF\u8272(&N)
+ColorChooser.rgbBlue.textAndMnemonic=\u84DD\u8272(&B)
+ColorChooser.rgbAlpha.textAndMnemonic=Alpha
+ColorChooser.rgbHexCode.textAndMnemonic=\u989C\u8272\u4EE3\u7801(&C)
+ColorChooser.cmyk.textAndMnemonic=C&MYK
+ColorChooser.cmykCyan.textAndMnemonic=\u9752\u8272
+ColorChooser.cmykMagenta.textAndMnemonic=\u7D2B\u7EA2\u8272
+ColorChooser.cmykYellow.textAndMnemonic=\u9EC4\u8272
+ColorChooser.cmykBlack.textAndMnemonic=\u9ED1\u8272
+ColorChooser.cmykAlpha.textAndMnemonic=Alpha
 
 ############ OPTION PANE STRINGS #############
-# 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(Y)
-OptionPane.yesButtonMnemonic=89
-OptionPane.noButtonText=\u5426(N)
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=\u786E\u5B9A
-OptionPane.okButtonMnemonic=O
-OptionPane.cancelButtonText=\u53D6\u6D88
-OptionPane.cancelButtonMnemonic=0
-OptionPane.titleText=\u9009\u62E9\u4E00\u4E2A\u9009\u9879
+OptionPane.yesButton.textAndMnemonic=\u662F(&Y)
+OptionPane.noButton.textAndMnemonic=\u5426(&N)
+OptionPane.okButton.textAndMnemonic=\u786E\u5B9A(&O)
+OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88
+OptionPane.title.textAndMnemonic=\u9009\u62E9\u4E00\u4E2A\u9009\u9879
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=\u8F93\u5165
+OptionPane.inputDialog.titleAndMnemonic=\u8F93\u5165
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=\u6D88\u606F
+OptionPane.messageDialog.titleAndMnemonic=\u6D88\u606F
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=\u6253\u5370
-PrintingDialog.titleAbortingText=\u6253\u5370 (\u6B63\u5728\u4E2D\u6B62)
+PrintingDialog.titleProgress.textAndMnemonic=\u6253\u5370
+PrintingDialog.titleAborting.textAndMnemonic=\u6253\u5370 (\u6B63\u5728\u4E2D\u6B62)
 
-PrintingDialog.contentInitialText=\u6B63\u5728\u8FDB\u884C\u6253\u5370...
+PrintingDialog.contentInitial.textAndMnemonic=\u6B63\u5728\u8FDB\u884C\u6253\u5370...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=\u5DF2\u6253\u5370\u9875 {0}...
+PrintingDialog.contentProgress.textAndMnemonic=\u5DF2\u6253\u5370\u9875 {0}...
 
-PrintingDialog.contentAbortingText=\u6B63\u5728\u4E2D\u6B62\u6253\u5370...
+PrintingDialog.contentAborting.textAndMnemonic=\u6B63\u5728\u4E2D\u6B62\u6253\u5370...
 
-PrintingDialog.abortButtonText=\u4E2D\u6B62(A)
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=\u4E2D\u6B62\u6253\u5370
+PrintingDialog.abortButton.textAndMnemonic=\u4E2D\u6B62(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6253\u5370
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316
@@ -183,42 +140,42 @@ InternalFrame.restoreButtonToolTip=\u8FD8\u539F
 InternalFrame.closeButtonToolTip=\u5173\u95ED
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=\u8FD8\u539F
-InternalFrameTitlePane.moveButtonText=\u79FB\u52A8
-InternalFrameTitlePane.sizeButtonText=\u5927\u5C0F
-InternalFrameTitlePane.minimizeButtonText=\u6700\u5C0F\u5316
-InternalFrameTitlePane.maximizeButtonText=\u6700\u5927\u5316
-InternalFrameTitlePane.closeButtonText=\u5173\u95ED
+InternalFrameTitlePane.restoreButton.textAndMnemonic=\u8FD8\u539F
+InternalFrameTitlePane.moveButton.textAndMnemonic=\u79FB\u52A8
+InternalFrameTitlePane.sizeButton.textAndMnemonic=\u5927\u5C0F
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=\u6700\u5C0F\u5316
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=\u6700\u5927\u5316
+InternalFrameTitlePane.closeButton.textAndMnemonic=\u5173\u95ED
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=\u63D0\u4EA4\u67E5\u8BE2
-FormView.resetButtonText=\u91CD\u8BBE
-FormView.browseFileButtonText=\u6D4F\u89C8...
+FormView.submitButton.textAndMnemonic=\u63D0\u4EA4\u67E5\u8BE2
+FormView.resetButton.textAndMnemonic=\u91CD\u8BBE
+FormView.browseFileButton.textAndMnemonic=\u6D4F\u89C8...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=\u6837\u5F0F\u66F4\u6539
-AbstractDocument.additionText=\u6DFB\u52A0
-AbstractDocument.deletionText=\u5220\u9664
-AbstractDocument.undoText=\u64A4\u6D88
-AbstractDocument.redoText=\u91CD\u505A
+AbstractDocument.styleChange.textAndMnemonic=\u6837\u5F0F\u66F4\u6539
+AbstractDocument.addition.textAndMnemonic=\u6DFB\u52A0
+AbstractDocument.deletion.textAndMnemonic=\u5220\u9664
+AbstractDocument.undo.textAndMnemonic=\u64A4\u6D88
+AbstractDocument.redo.textAndMnemonic=\u91CD\u505A
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=\u5355\u51FB
+AbstractButton.click.textAndMnemonic=\u5355\u51FB
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=\u64A4\u6D88
-AbstractUndoableEdit.redoText=\u91CD\u505A
+AbstractUndoableEdit.undo.textAndMnemonic=\u64A4\u6D88
+AbstractUndoableEdit.redo.textAndMnemonic=\u91CD\u505A
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=togglePopup
+ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=\u8FDB\u5EA6...
+ProgressMonitor.progress.textAndMnemonic=\u8FDB\u5EA6...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=\u5DE6\u952E
-SplitPane.rightButtonText=\u53F3\u952E
+SplitPane.leftButton.textAndMnemonic=\u5DE6\u952E
+SplitPane.rightButton.textAndMnemonic=\u53F3\u952E
 # Used for Isindex
 IsindexView.prompt=\u8FD9\u662F\u53EF\u641C\u7D22\u7D22\u5F15\u3002\u8BF7\u8F93\u5165\u641C\u7D22\u5173\u952E\u5B57:
 

src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties

@@ -15,27 +15,12 @@
 #                        MNEMONIC NOTE:
 # Many of strings in this file are used by widgets that have a
 # mnemonic, for example:
-#   ColorChooser.rgbNameText=RGB
-#   ColorChooser.rgbMnemonic=71
-#   ColorChooser.rgbDisplayedMnemonicIndex=1
+#   ColorChooser.rgbNameTextAndMnemonic=R&GB
 # Indicates that the tab in the ColorChooser for RGB colors will have
 # the text 'RGB', further the mnemonic character will be 'g' and that
 # a decoration will be provided under the 'G'. This will typically
 # look like:  RGB
 #              -
-# 71 corresponds to the decimal value of the VK constant defined
-# in java/awt/KeyEvent.java. VK_G is defined as:
-#
-#    public static final int VK_G              = 0x47;
-#
-# 0x47 is a hex number and needs to be converted to decimal.
-# A simple way to calculate this for a-z is to add 64 to the index of
-# the letter in the alphabet. As 'a' is in the 1st letter the mnemonic
-# for 'a' is 65, 'b' is 66...
-#
-# The xxDisplayedMnemonicIndex is used to indicate the index of the
-# character that should be underlined in the String, with 0
-# corresponding to the first character in the String.
 #
 # One important thing to remember is that the mnemonic MUST exist in
 # the String, if it does not exist you should add text that makes it
@@ -45,30 +30,24 @@
 # @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.fileDescription.textAndMnemonic=\u4E00\u822C\u6A94\u6848
+FileChooser.directoryDescription.textAndMnemonic=\u76EE\u9304
+FileChooser.newFolderError.textAndMnemonic=\u5EFA\u7ACB\u65B0\u8CC7\u6599\u593E\u6642\u767C\u751F\u932F\u8AA4
 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.cancelButtonMnemonic=67
-FileChooser.saveButtonText=\u5132\u5B58
-FileChooser.saveButtonMnemonic=83
-FileChooser.openButtonText=\u958B\u555F
-FileChooser.openButtonMnemonic=79
-FileChooser.saveDialogTitleText=\u5132\u5B58
-FileChooser.openDialogTitleText=\u958B\u555F
-FileChooser.updateButtonText=\u66F4\u65B0(U)
-FileChooser.updateButtonMnemonic=85
-FileChooser.helpButtonText=\u8AAA\u660E(H)
-FileChooser.helpButtonMnemonic=72
-FileChooser.directoryOpenButtonText=\u958B\u555F(O)
-FileChooser.directoryOpenButtonMnemonic=79
+FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=\u7121\u6CD5\u5EFA\u7ACB\u8CC7\u6599\u593E
+FileChooser.newFolderParentDoesntExist.textAndMnemonic=\u7121\u6CD5\u5EFA\u7ACB\u8CC7\u6599\u593E\u3002\n\n\u7CFB\u7D71\u627E\u4E0D\u5230\u6307\u5B9A\u7684\u8DEF\u5F91\u3002
+FileChooser.renameErrorTitle.textAndMnemonic=\u91CD\u65B0\u547D\u540D\u6A94\u6848\u6216\u8CC7\u6599\u593E\u6642\u767C\u751F\u932F\u8AA4\u3002
+FileChooser.renameError.textAndMnemonic=\u7121\u6CD5\u91CD\u65B0\u547D\u540D {0}
+FileChooser.renameErrorFileExists.textAndMnemonic=\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.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6A94\u6848
+FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88(&C)
+FileChooser.saveButton.textAndMnemonic=\u5132\u5B58(&S)
+FileChooser.openButton.textAndMnemonic=\u958B\u555F(&O)
+FileChooser.saveDialogTitle.textAndMnemonic=\u5132\u5B58
+FileChooser.openDialogTitle.textAndMnemonic=\u958B\u555F
+FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0(&U)
+FileChooser.helpButton.textAndMnemonic=\u8AAA\u660E(&H)
+FileChooser.directoryOpenButton.textAndMnemonic=\u958B\u555F(&O)
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -83,98 +62,76 @@ FileChooser.other.newFolder.subsequent=\u65B0\u8CC7\u6599\u593E.{0}
 
 
 ## file chooser tooltips ###
-FileChooser.cancelButtonToolTipText=\u4E2D\u6B62\u6A94\u6848\u9078\u64C7\u5668\u5C0D\u8A71\u65B9\u584A
-FileChooser.saveButtonToolTipText=\u5132\u5B58\u9078\u53D6\u7684\u6A94\u6848
-FileChooser.openButtonToolTipText=\u958B\u555F\u9078\u53D6\u7684\u6A94\u6848
-FileChooser.updateButtonToolTipText=\u66F4\u65B0\u76EE\u9304\u6E05\u55AE
-FileChooser.helpButtonToolTipText=\u300C\u6A94\u6848\u9078\u64C7\u5668\u300D\u8AAA\u660E
-FileChooser.directoryOpenButtonToolTipText=\u958B\u555F\u9078\u53D6\u7684\u76EE\u9304
+FileChooser.cancelButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6A94\u6848\u9078\u64C7\u5668\u5C0D\u8A71\u65B9\u584A
+FileChooser.saveButtonToolTip.textAndMnemonic=\u5132\u5B58\u9078\u53D6\u7684\u6A94\u6848
+FileChooser.openButtonToolTip.textAndMnemonic=\u958B\u555F\u9078\u53D6\u7684\u6A94\u6848
+FileChooser.updateButtonToolTip.textAndMnemonic=\u66F4\u65B0\u76EE\u9304\u6E05\u55AE
+FileChooser.helpButtonToolTip.textAndMnemonic=\u300C\u6A94\u6848\u9078\u64C7\u5668\u300D\u8AAA\u660E
+FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u958B\u555F\u9078\u53D6\u7684\u76EE\u9304
 
 FileChooser.filesListAccessibleName=Files List
 FileChooser.filesDetailsAccessibleName=Files Details
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.previewText=\u9810\u89BD
-ColorChooser.okText=\u78BA\u5B9A
-ColorChooser.cancelText=\u53D6\u6D88
-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(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.hsvMnemonic=72
-ColorChooser.hsvHueText=\u8272\u8ABF
-ColorChooser.hsvSaturationText=\u5F69\u5EA6
-ColorChooser.hsvValueText=\u6578\u503C
-ColorChooser.hsvTransparencyText=\u900F\u660E\u5EA6
-ColorChooser.hslNameText=HSL
-ColorChooser.hslMnemonic=76
-ColorChooser.hslHueText=\u8272\u8ABF
-ColorChooser.hslSaturationText=\u5F69\u5EA6
-ColorChooser.hslLightnessText=\u4EAE\u5EA6
-ColorChooser.hslTransparencyText=\u900F\u660E\u5EA6
-ColorChooser.rgbNameText=RGB
-ColorChooser.rgbMnemonic=71
-ColorChooser.rgbRedText=\u7D05
-ColorChooser.rgbRedMnemonic=68
-ColorChooser.rgbGreenText=\u7DA0
-ColorChooser.rgbGreenMnemonic=78
-ColorChooser.rgbBlueText=\u85CD
-ColorChooser.rgbBlueMnemonic=66
-ColorChooser.rgbAlphaText=Alpha
-ColorChooser.rgbHexCodeText=\u984F\u8272\u4EE3\u78BC(C)
-ColorChooser.rgbHexCodeMnemonic=67
-ColorChooser.cmykNameText=CMYK
-ColorChooser.cmykMnemonic=77
-ColorChooser.cmykCyanText=\u85CD\u7DA0\u8272
-ColorChooser.cmykMagentaText=\u7D2B\u7D05\u8272
-ColorChooser.cmykYellowText=\u9EC3\u8272
-ColorChooser.cmykBlackText=\u9ED1\u8272
-ColorChooser.cmykAlphaText=Alpha
+ColorChooser.preview.textAndMnemonic=\u9810\u89BD
+ColorChooser.ok.textAndMnemonic=\u78BA\u5B9A
+ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88
+ColorChooser.reset.textAndMnemonic=\u91CD\u8A2D(&R)
+ColorChooser.sample.textAndMnemonic=\u7BC4\u4F8B\u6587\u5B57  \u7BC4\u4F8B\u6587\u5B57
+ColorChooser.swatches.textAndMnemonic=\u8ABF\u8272\u677F(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u65B0\u9078\u64C7:
+ColorChooser.hsv.textAndMnemonic=&HSV
+ColorChooser.hsvHue.textAndMnemonic=\u8272\u8ABF
+ColorChooser.hsvSaturation.textAndMnemonic=\u5F69\u5EA6
+ColorChooser.hsvValue.textAndMnemonic=\u6578\u503C
+ColorChooser.hsvTransparency.textAndMnemonic=\u900F\u660E\u5EA6
+ColorChooser.hsl.textAndMnemonic=HS&L
+ColorChooser.hslHue.textAndMnemonic=\u8272\u8ABF
+ColorChooser.hslSaturation.textAndMnemonic=\u5F69\u5EA6
+ColorChooser.hslLightness.textAndMnemonic=\u4EAE\u5EA6
+ColorChooser.hslTransparency.textAndMnemonic=\u900F\u660E\u5EA6
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=\u7D05(&D)
+ColorChooser.rgbGreen.textAndMnemonic=\u7DA0(&N)
+ColorChooser.rgbBlue.textAndMnemonic=\u85CD(&B)
+ColorChooser.rgbAlpha.textAndMnemonic=Alpha
+ColorChooser.rgbHexCode.textAndMnemonic=\u984F\u8272\u4EE3\u78BC(&C)
+ColorChooser.cmyk.textAndMnemonic=C&MYK
+ColorChooser.cmykCyan.textAndMnemonic=\u85CD\u7DA0\u8272
+ColorChooser.cmykMagenta.textAndMnemonic=\u7D2B\u7D05\u8272
+ColorChooser.cmykYellow.textAndMnemonic=\u9EC3\u8272
+ColorChooser.cmykBlack.textAndMnemonic=\u9ED1\u8272
+ColorChooser.cmykAlpha.textAndMnemonic=Alpha
 
 ############ OPTION PANE STRINGS #############
-# 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(Y)
-OptionPane.yesButtonMnemonic=89
-OptionPane.noButtonText=\u5426(N)
-OptionPane.noButtonMnemonic=78
-OptionPane.okButtonText=\u78BA\u5B9A
-OptionPane.okButtonMnemonic=O
-OptionPane.cancelButtonText=\u53D6\u6D88
-OptionPane.cancelButtonMnemonic=0
-OptionPane.titleText=\u9078\u53D6\u4E00\u500B\u9078\u9805
+OptionPane.yesButton.textAndMnemonic=\u662F(&Y)
+OptionPane.noButton.textAndMnemonic=\u5426(&N)
+OptionPane.okButton.textAndMnemonic=\u78BA\u5B9A(&O)
+OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88
+OptionPane.title.textAndMnemonic=\u9078\u53D6\u4E00\u500B\u9078\u9805
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.inputDialogTitle=\u8F38\u5165
+OptionPane.inputDialog.titleAndMnemonic=\u8F38\u5165
 # Title for the dialog for the showMessageDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
-OptionPane.messageDialogTitle=\u8A0A\u606F
+OptionPane.messageDialog.titleAndMnemonic=\u8A0A\u606F
 
 ############ Printing Dialog Strings ############
-PrintingDialog.titleProgressText=\u5217\u5370
-PrintingDialog.titleAbortingText=\u5217\u5370 (\u4E2D\u6B62)
+PrintingDialog.titleProgress.textAndMnemonic=\u5217\u5370
+PrintingDialog.titleAborting.textAndMnemonic=\u5217\u5370 (\u4E2D\u6B62)
 
-PrintingDialog.contentInitialText=\u6B63\u5728\u5217\u5370...
+PrintingDialog.contentInitial.textAndMnemonic=\u6B63\u5728\u5217\u5370...
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgressText=\u5DF2\u5217\u5370\u7684\u9801\u9762 {0}...
+PrintingDialog.contentProgress.textAndMnemonic=\u5DF2\u5217\u5370\u7684\u9801\u9762 {0}...
 
-PrintingDialog.contentAbortingText=\u6B63\u5728\u4E2D\u6B62\u5217\u5370...
+PrintingDialog.contentAborting.textAndMnemonic=\u6B63\u5728\u4E2D\u6B62\u5217\u5370...
 
-PrintingDialog.abortButtonText=\u4E2D\u6B62(A)
-PrintingDialog.abortButtonMnemonic=65
-PrintingDialog.abortButtonDisplayedMnemonicIndex=0
-PrintingDialog.abortButtonToolTipText=\u4E2D\u6B62\u5217\u5370
+PrintingDialog.abortButton.textAndMnemonic=\u4E2D\u6B62(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u5217\u5370
 
 ############ Internal Frame Strings ############
 InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316
@@ -183,42 +140,42 @@ InternalFrame.restoreButtonToolTip=\u5FA9\u539F
 InternalFrame.closeButtonToolTip=\u95DC\u9589
 
 ############ Internal Frame Title Pane Strings ############
-InternalFrameTitlePane.restoreButtonText=\u5FA9\u539F
-InternalFrameTitlePane.moveButtonText=\u79FB\u52D5
-InternalFrameTitlePane.sizeButtonText=\u5927\u5C0F
-InternalFrameTitlePane.minimizeButtonText=\u6700\u5C0F\u5316
-InternalFrameTitlePane.maximizeButtonText=\u6700\u5927\u5316
-InternalFrameTitlePane.closeButtonText=\u95DC\u9589
+InternalFrameTitlePane.restoreButton.textAndMnemonic=\u5FA9\u539F
+InternalFrameTitlePane.moveButton.textAndMnemonic=\u79FB\u52D5
+InternalFrameTitlePane.sizeButton.textAndMnemonic=\u5927\u5C0F
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=\u6700\u5C0F\u5316
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=\u6700\u5927\u5316
+InternalFrameTitlePane.closeButton.textAndMnemonic=\u95DC\u9589
 
 ############ Text strings #############
 # Used for html forms
-FormView.submitButtonText=\u9001\u51FA\u67E5\u8A62
-FormView.resetButtonText=\u91CD\u8A2D
-FormView.browseFileButtonText=\u700F\u89BD...
+FormView.submitButton.textAndMnemonic=\u9001\u51FA\u67E5\u8A62
+FormView.resetButton.textAndMnemonic=\u91CD\u8A2D
+FormView.browseFileButton.textAndMnemonic=\u700F\u89BD...
 
 ############ Abstract Document Strings ############
-AbstractDocument.styleChangeText=\u6A23\u5F0F\u8B8A\u66F4
-AbstractDocument.additionText=\u9644\u52A0
-AbstractDocument.deletionText=\u522A\u9664
-AbstractDocument.undoText=\u9084\u539F
-AbstractDocument.redoText=\u91CD\u505A
+AbstractDocument.styleChange.textAndMnemonic=\u6A23\u5F0F\u8B8A\u66F4
+AbstractDocument.addition.textAndMnemonic=\u9644\u52A0
+AbstractDocument.deletion.textAndMnemonic=\u522A\u9664
+AbstractDocument.undo.textAndMnemonic=\u9084\u539F
+AbstractDocument.redo.textAndMnemonic=\u91CD\u505A
 
 ############ Abstract Button Strings ############
-AbstractButton.clickText=\u6309\u4E00\u4E0B
+AbstractButton.click.textAndMnemonic=\u6309\u4E00\u4E0B
 
 ############ Abstract Undoable Edit Strings ############
-AbstractUndoableEdit.undoText=\u9084\u539F
-AbstractUndoableEdit.redoText=\u91CD\u505A
+AbstractUndoableEdit.undo.textAndMnemonic=\u9084\u539F
+AbstractUndoableEdit.redo.textAndMnemonic=\u91CD\u505A
 
 ############ Combo Box Strings ############
-ComboBox.togglePopupText=\u5207\u63DB\u5373\u73FE\u5F0F\u8996\u7A97
+ComboBox.togglePopup.textAndMnemonic=\u5207\u63DB\u5373\u73FE\u5F0F\u8996\u7A97
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progressText=\u9032\u5EA6...
+ProgressMonitor.progress.textAndMnemonic=\u9032\u5EA6...
 
 ############ Split Pane Strings ############
-SplitPane.leftButtonText=\u5DE6\u6309\u9215
-SplitPane.rightButtonText=\u53F3\u6309\u9215
+SplitPane.leftButton.textAndMnemonic=\u5DE6\u6309\u9215
+SplitPane.rightButton.textAndMnemonic=\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:
 

src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties

@@ -18,43 +18,34 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=Look In:
-FileChooser.lookInLabelMnemonic=73
-FileChooser.saveInLabelText=Save In:
-FileChooser.fileNameLabelText=File Name:
-FileChooser.fileNameLabelMnemonic=78
-FileChooser.folderNameLabelText=Folder name:
-FileChooser.folderNameLabelMnemonic=78
-FileChooser.filesOfTypeLabelText=Files of Type:
-FileChooser.filesOfTypeLabelMnemonic=84
-FileChooser.upFolderToolTipText=Up One Level
+FileChooser.lookInLabel.textAndMnemonic=Look &In:
+FileChooser.saveInLabel.textAndMnemonic=Save In:
+FileChooser.fileNameLabel.textAndMnemonic=File &Name:
+FileChooser.folderNameLabel.textAndMnemonic=Folder &name:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Files of &Type:
+FileChooser.upFolderToolTip.textAndMnemonic=Up One Level
 FileChooser.upFolderAccessibleName=Up
-FileChooser.homeFolderToolTipText=Home
+FileChooser.homeFolderToolTip.textAndMnemonic=Home
 FileChooser.homeFolderAccessibleName=Home
-FileChooser.newFolderToolTipText=Create New Folder
+FileChooser.newFolderToolTip.textAndMnemonic=Create New Folder
 FileChooser.newFolderAccessibleName=New Folder
-FileChooser.newFolderActionLabelText=New Folder
-FileChooser.listViewButtonToolTipText=List
+FileChooser.newFolderActionLabel.textAndMnemonic=New Folder
+FileChooser.listViewButtonToolTip.textAndMnemonic=List
 FileChooser.listViewButtonAccessibleName=List
-FileChooser.listViewActionLabelText=List
-FileChooser.detailsViewButtonToolTipText=Details
+FileChooser.listViewActionLabel.textAndMnemonic=List
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Details
 FileChooser.detailsViewButtonAccessibleName=Details
-FileChooser.detailsViewActionLabelText=Details
-FileChooser.refreshActionLabelText=Refresh
-FileChooser.viewMenuLabelText=View
-FileChooser.fileNameHeaderText=Name
-FileChooser.fileSizeHeaderText=Size
-FileChooser.fileTypeHeaderText=Type
-FileChooser.fileDateHeaderText=Modified
-FileChooser.fileAttrHeaderText=Attributes
+FileChooser.detailsViewActionLabel.textAndMnemonic=Details
+FileChooser.refreshActionLabel.textAndMnemonic=Refresh
+FileChooser.viewMenuLabel.textAndMnemonic=View
+FileChooser.fileNameHeader.textAndMnemonic=Name
+FileChooser.fileSizeHeader.textAndMnemonic=Size
+FileChooser.fileTypeHeader.textAndMnemonic=Type
+FileChooser.fileDateHeader.textAndMnemonic=Modified
+FileChooser.fileAttrHeader.textAndMnemonic=Attributes
 
 ############ Used by MetalTitlePane if rendering window decorations############
-# All mnemonics are KeyEvent.VK_XXX as integers
-MetalTitlePane.restoreTitle=Restore
-MetalTitlePane.restoreMnemonic=82
-MetalTitlePane.iconifyTitle=Minimize
-MetalTitlePane.iconifyMnemonic=69
-MetalTitlePane.maximizeTitle=Maximize
-MetalTitlePane.maximizeMnemonic=88
-MetalTitlePane.closeTitle=Close
-MetalTitlePane.closeMnemonic=67
+MetalTitlePane.restore.titleAndMnemonic=&Restore
+MetalTitlePane.iconify.titleAndMnemonic=Minimiz&e
+MetalTitlePane.maximize.titleAndMnemonic=Ma&ximize
+MetalTitlePane.close.titleAndMnemonic=&Close

src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties

@@ -18,44 +18,35 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=Suchen in:
-FileChooser.lookInLabelMnemonic=73
-FileChooser.saveInLabelText=Speichern in:
-FileChooser.fileNameLabelText=Dateiname:
-FileChooser.fileNameLabelMnemonic=78
-FileChooser.folderNameLabelText=Ordnername:
-FileChooser.folderNameLabelMnemonic=78
-FileChooser.filesOfTypeLabelText=Dateityp:
-FileChooser.filesOfTypeLabelMnemonic=84
-FileChooser.upFolderToolTipText=Eine Ebene h\u00F6her
+FileChooser.lookInLabel.textAndMnemonic=Suchen &in:
+FileChooser.saveInLabel.textAndMnemonic=Speichern in:
+FileChooser.fileNameLabel.textAndMnemonic=Datei&name:
+FileChooser.folderNameLabel.textAndMnemonic=Ord&nername:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Da&teityp:
+FileChooser.upFolderToolTip.textAndMnemonic=Eine Ebene h\u00F6her
 FileChooser.upFolderAccessibleName=Nach oben
-FileChooser.homeFolderToolTipText=Home
+FileChooser.homeFolderToolTip.textAndMnemonic=Home
 FileChooser.homeFolderAccessibleName=Home
-FileChooser.newFolderToolTipText=Neuen Ordner erstellen
+FileChooser.newFolderToolTip.textAndMnemonic=Neuen Ordner erstellen
 FileChooser.newFolderAccessibleName=Neuer Ordner
-FileChooser.newFolderActionLabelText=Neuer Ordner
-FileChooser.listViewButtonToolTipText=Liste
+FileChooser.newFolderActionLabel.textAndMnemonic=Neuer Ordner
+FileChooser.listViewButtonToolTip.textAndMnemonic=Liste
 FileChooser.listViewButtonAccessibleName=Liste
-FileChooser.listViewActionLabelText=Liste
-FileChooser.detailsViewButtonToolTipText=Details
+FileChooser.listViewActionLabel.textAndMnemonic=Liste
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Details
 FileChooser.detailsViewButtonAccessibleName=Details
-FileChooser.detailsViewActionLabelText=Details
-FileChooser.refreshActionLabelText=Aktualisieren
-FileChooser.viewMenuLabelText=Ansicht
-FileChooser.fileNameHeaderText=Name
-FileChooser.fileSizeHeaderText=Gr\u00F6\u00DFe
-FileChooser.fileTypeHeaderText=Typ
-FileChooser.fileDateHeaderText=Ge\u00E4ndert
-FileChooser.fileAttrHeaderText=Attribute
+FileChooser.detailsViewActionLabel.textAndMnemonic=Details
+FileChooser.refreshActionLabel.textAndMnemonic=Aktualisieren
+FileChooser.viewMenuLabel.textAndMnemonic=Ansicht
+FileChooser.fileNameHeader.textAndMnemonic=Name
+FileChooser.fileSizeHeader.textAndMnemonic=Gr\u00F6\u00DFe
+FileChooser.fileTypeHeader.textAndMnemonic=Typ
+FileChooser.fileDateHeader.textAndMnemonic=Ge\u00E4ndert
+FileChooser.fileAttrHeader.textAndMnemonic=Attribute
 
 ############ Used by MetalTitlePane if rendering window decorations############
-# All mnemonics are KeyEvent.VK_XXX as integers
-MetalTitlePane.restoreTitle=Wiederherstellen
-MetalTitlePane.restoreMnemonic=87
-MetalTitlePane.iconifyTitle=Minimieren
-MetalTitlePane.iconifyMnemonic=82
-MetalTitlePane.maximizeTitle=Maximieren
-MetalTitlePane.maximizeMnemonic=88
-MetalTitlePane.closeTitle=Schlie\u00DFen
-MetalTitlePane.closeMnemonic=83
+MetalTitlePane.restore.titleAndMnemonic=&Wiederherstellen
+MetalTitlePane.iconify.titleAndMnemonic=Minimie&ren
+MetalTitlePane.maximize.titleAndMnemonic=Ma&ximieren
+MetalTitlePane.close.titleAndMnemonic=Schlie\u00DFen(&S)
 

src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties

@@ -18,44 +18,35 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=Buscar en:
-FileChooser.lookInLabelMnemonic=73
-FileChooser.saveInLabelText=Guardar en:
-FileChooser.fileNameLabelText=Nombre de Archivo:
-FileChooser.fileNameLabelMnemonic=78
-FileChooser.folderNameLabelText=Nombre de la Carpeta:
-FileChooser.folderNameLabelMnemonic=78
-FileChooser.filesOfTypeLabelText=Archivos de Tipo:
-FileChooser.filesOfTypeLabelMnemonic=84
-FileChooser.upFolderToolTipText=Subir un Nivel
+FileChooser.lookInLabel.textAndMnemonic=Buscar en(&I):
+FileChooser.saveInLabel.textAndMnemonic=Guardar en:
+FileChooser.fileNameLabel.textAndMnemonic=&Nombre de Archivo:
+FileChooser.folderNameLabel.textAndMnemonic=&Nombre de la Carpeta:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Archivos de &Tipo:
+FileChooser.upFolderToolTip.textAndMnemonic=Subir un Nivel
 FileChooser.upFolderAccessibleName=Arriba
-FileChooser.homeFolderToolTipText=Inicio
+FileChooser.homeFolderToolTip.textAndMnemonic=Inicio
 FileChooser.homeFolderAccessibleName=Inicio
-FileChooser.newFolderToolTipText=Crear Nueva Carpeta
+FileChooser.newFolderToolTip.textAndMnemonic=Crear Nueva Carpeta
 FileChooser.newFolderAccessibleName=Nueva Carpeta
-FileChooser.newFolderActionLabelText=Nueva Carpeta
-FileChooser.listViewButtonToolTipText=Lista
+FileChooser.newFolderActionLabel.textAndMnemonic=Nueva Carpeta
+FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
 FileChooser.listViewButtonAccessibleName=Lista
-FileChooser.listViewActionLabelText=Lista
-FileChooser.detailsViewButtonToolTipText=Detalles
+FileChooser.listViewActionLabel.textAndMnemonic=Lista
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detalles
 FileChooser.detailsViewButtonAccessibleName=Detalles
-FileChooser.detailsViewActionLabelText=Detalles
-FileChooser.refreshActionLabelText=Refrescar
-FileChooser.viewMenuLabelText=Ver
-FileChooser.fileNameHeaderText=Nombre
-FileChooser.fileSizeHeaderText=Tama\u00F1o
-FileChooser.fileTypeHeaderText=Tipo
-FileChooser.fileDateHeaderText=Modificado
-FileChooser.fileAttrHeaderText=Atributos
+FileChooser.detailsViewActionLabel.textAndMnemonic=Detalles
+FileChooser.refreshActionLabel.textAndMnemonic=Refrescar
+FileChooser.viewMenuLabel.textAndMnemonic=Ver
+FileChooser.fileNameHeader.textAndMnemonic=Nombre
+FileChooser.fileSizeHeader.textAndMnemonic=Tama\u00F1o
+FileChooser.fileTypeHeader.textAndMnemonic=Tipo
+FileChooser.fileDateHeader.textAndMnemonic=Modificado
+FileChooser.fileAttrHeader.textAndMnemonic=Atributos
 
 ############ Used by MetalTitlePane if rendering window decorations############
-# All mnemonics are KeyEvent.VK_XXX as integers
-MetalTitlePane.restoreTitle=Restaurar
-MetalTitlePane.restoreMnemonic=82
-MetalTitlePane.iconifyTitle=Minimizar
-MetalTitlePane.iconifyMnemonic=90
-MetalTitlePane.maximizeTitle=Maximizar
-MetalTitlePane.maximizeMnemonic=88
-MetalTitlePane.closeTitle=Cerrar
-MetalTitlePane.closeMnemonic=67
+MetalTitlePane.restore.titleAndMnemonic=&Restaurar
+MetalTitlePane.iconify.titleAndMnemonic=Minimi&zar
+MetalTitlePane.maximize.titleAndMnemonic=Ma&ximizar
+MetalTitlePane.close.titleAndMnemonic=&Cerrar
 

src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties

@@ -18,44 +18,35 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=Rechercher dans :
-FileChooser.lookInLabelMnemonic=73
-FileChooser.saveInLabelText=Enregistrer dans :
-FileChooser.fileNameLabelText=Nom du fichier :
-FileChooser.fileNameLabelMnemonic=78
-FileChooser.folderNameLabelText=Nom du dossier :
-FileChooser.folderNameLabelMnemonic=78
-FileChooser.filesOfTypeLabelText=Fichiers de type :
-FileChooser.filesOfTypeLabelMnemonic=84
-FileChooser.upFolderToolTipText=Remonte d'un niveau.
+FileChooser.lookInLabel.textAndMnemonic=Rechercher dans (&I):
+FileChooser.saveInLabel.textAndMnemonic=Enregistrer dans :
+FileChooser.fileNameLabel.textAndMnemonic=&Nom du fichier :
+FileChooser.folderNameLabel.textAndMnemonic=&Nom du dossier :
+FileChooser.filesOfTypeLabel.textAndMnemonic=Fichiers de &type :
+FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau.
 FileChooser.upFolderAccessibleName=Monter
-FileChooser.homeFolderToolTipText=R\u00E9pertoire d'origine
+FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire d'origine
 FileChooser.homeFolderAccessibleName=R\u00E9pertoire d'origine
-FileChooser.newFolderToolTipText=Cr\u00E9e un dossier.
+FileChooser.newFolderToolTip.textAndMnemonic=Cr\u00E9e un dossier.
 FileChooser.newFolderAccessibleName=Nouveau dossier
-FileChooser.newFolderActionLabelText=Nouveau dossier
-FileChooser.listViewButtonToolTipText=Liste
+FileChooser.newFolderActionLabel.textAndMnemonic=Nouveau dossier
+FileChooser.listViewButtonToolTip.textAndMnemonic=Liste
 FileChooser.listViewButtonAccessibleName=Liste
-FileChooser.listViewActionLabelText=Liste
-FileChooser.detailsViewButtonToolTipText=D\u00E9tails
+FileChooser.listViewActionLabel.textAndMnemonic=Liste
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=D\u00E9tails
 FileChooser.detailsViewButtonAccessibleName=D\u00E9tails
-FileChooser.detailsViewActionLabelText=D\u00E9tails
-FileChooser.refreshActionLabelText=Actualiser
-FileChooser.viewMenuLabelText=Affichage
-FileChooser.fileNameHeaderText=Nom
-FileChooser.fileSizeHeaderText=Taille
-FileChooser.fileTypeHeaderText=Type
-FileChooser.fileDateHeaderText=Modifi\u00E9
-FileChooser.fileAttrHeaderText=Attributs
+FileChooser.detailsViewActionLabel.textAndMnemonic=D\u00E9tails
+FileChooser.refreshActionLabel.textAndMnemonic=Actualiser
+FileChooser.viewMenuLabel.textAndMnemonic=Affichage
+FileChooser.fileNameHeader.textAndMnemonic=Nom
+FileChooser.fileSizeHeader.textAndMnemonic=Taille
+FileChooser.fileTypeHeader.textAndMnemonic=Type
+FileChooser.fileDateHeader.textAndMnemonic=Modifi\u00E9
+FileChooser.fileAttrHeader.textAndMnemonic=Attributs
 
 ############ Used by MetalTitlePane if rendering window decorations############
-# All mnemonics are KeyEvent.VK_XXX as integers
-MetalTitlePane.restoreTitle=Restaurer
-MetalTitlePane.restoreMnemonic=82
-MetalTitlePane.iconifyTitle=R\u00E9duire
-MetalTitlePane.iconifyMnemonic=68
-MetalTitlePane.maximizeTitle=Agrandir
-MetalTitlePane.maximizeMnemonic=65
-MetalTitlePane.closeTitle=Fermer
-MetalTitlePane.closeMnemonic=70
+MetalTitlePane.restore.titleAndMnemonic=&Restaurer
+MetalTitlePane.iconify.titleAndMnemonic=R\u00E9duire(&D)
+MetalTitlePane.maximize.titleAndMnemonic=&Agrandir
+MetalTitlePane.close.titleAndMnemonic=&Fermer
 

src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties

@@ -18,44 +18,35 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=Cerca in:
-FileChooser.lookInLabelMnemonic=73
-FileChooser.saveInLabelText=Salva in:
-FileChooser.fileNameLabelText=Nome file:
-FileChooser.fileNameLabelMnemonic=78
-FileChooser.folderNameLabelText=Nome della cartella:
-FileChooser.folderNameLabelMnemonic=78
-FileChooser.filesOfTypeLabelText=Tipo file:
-FileChooser.filesOfTypeLabelMnemonic=84
-FileChooser.upFolderToolTipText=Cartella superiore
+FileChooser.lookInLabel.textAndMnemonic=Cerca &in:
+FileChooser.saveInLabel.textAndMnemonic=Salva in:
+FileChooser.fileNameLabel.textAndMnemonic=&Nome file:
+FileChooser.folderNameLabel.textAndMnemonic=&Nome della cartella:
+FileChooser.filesOfTypeLabel.textAndMnemonic=&Tipo file:
+FileChooser.upFolderToolTip.textAndMnemonic=Cartella superiore
 FileChooser.upFolderAccessibleName=Superiore
-FileChooser.homeFolderToolTipText=Home
+FileChooser.homeFolderToolTip.textAndMnemonic=Home
 FileChooser.homeFolderAccessibleName=Home
-FileChooser.newFolderToolTipText=Crea nuova cartella
+FileChooser.newFolderToolTip.textAndMnemonic=Crea nuova cartella
 FileChooser.newFolderAccessibleName=Nuova cartella
-FileChooser.newFolderActionLabelText=Nuova cartella
-FileChooser.listViewButtonToolTipText=Lista
+FileChooser.newFolderActionLabel.textAndMnemonic=Nuova cartella
+FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
 FileChooser.listViewButtonAccessibleName=Lista
-FileChooser.listViewActionLabelText=Lista
-FileChooser.detailsViewButtonToolTipText=Dettagli
+FileChooser.listViewActionLabel.textAndMnemonic=Lista
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Dettagli
 FileChooser.detailsViewButtonAccessibleName=Dettagli
-FileChooser.detailsViewActionLabelText=Dettagli
-FileChooser.refreshActionLabelText=Aggiorna
-FileChooser.viewMenuLabelText=Visualizza
-FileChooser.fileNameHeaderText=Nome
-FileChooser.fileSizeHeaderText=Dimensioni
-FileChooser.fileTypeHeaderText=Tipo
-FileChooser.fileDateHeaderText=Modificato
-FileChooser.fileAttrHeaderText=Attributi
+FileChooser.detailsViewActionLabel.textAndMnemonic=Dettagli
+FileChooser.refreshActionLabel.textAndMnemonic=Aggiorna
+FileChooser.viewMenuLabel.textAndMnemonic=Visualizza
+FileChooser.fileNameHeader.textAndMnemonic=Nome
+FileChooser.fileSizeHeader.textAndMnemonic=Dimensioni
+FileChooser.fileTypeHeader.textAndMnemonic=Tipo
+FileChooser.fileDateHeader.textAndMnemonic=Modificato
+FileChooser.fileAttrHeader.textAndMnemonic=Attributi
 
 ############ Used by MetalTitlePane if rendering window decorations############
-# All mnemonics are KeyEvent.VK_XXX as integers
-MetalTitlePane.restoreTitle=Ripristina
-MetalTitlePane.restoreMnemonic=82
-MetalTitlePane.iconifyTitle=Riduci a icona
-MetalTitlePane.iconifyMnemonic=85
-MetalTitlePane.maximizeTitle=Ingrandisci
-MetalTitlePane.maximizeMnemonic=71
-MetalTitlePane.closeTitle=Chiudi
-MetalTitlePane.closeMnemonic=67
+MetalTitlePane.restore.titleAndMnemonic=&Ripristina
+MetalTitlePane.iconify.titleAndMnemonic=Rid&uci a icona
+MetalTitlePane.maximize.titleAndMnemonic=In&grandisci
+MetalTitlePane.close.titleAndMnemonic=&Chiudi
 

src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties

@@ -18,44 +18,35 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=\u53C2\u7167:
-FileChooser.lookInLabelMnemonic=73
-FileChooser.saveInLabelText=\u4FDD\u5B58:
-FileChooser.fileNameLabelText=\u30D5\u30A1\u30A4\u30EB\u540D:
-FileChooser.fileNameLabelMnemonic=78
-FileChooser.folderNameLabelText=\u30D5\u30A9\u30EB\u30C0\u540D:
-FileChooser.folderNameLabelMnemonic=78
-FileChooser.filesOfTypeLabelText=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7:
-FileChooser.filesOfTypeLabelMnemonic=84
-FileChooser.upFolderToolTipText=1\u30EC\u30D9\u30EB\u4E0A\u3078
+FileChooser.lookInLabel.textAndMnemonic=\u53C2\u7167(&I):
+FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58:
+FileChooser.fileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u540D(&N):
+FileChooser.folderNameLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7(&T):
+FileChooser.upFolderToolTip.textAndMnemonic=1\u30EC\u30D9\u30EB\u4E0A\u3078
 FileChooser.upFolderAccessibleName=\u4E0A\u3078
-FileChooser.homeFolderToolTipText=\u30DB\u30FC\u30E0
+FileChooser.homeFolderToolTip.textAndMnemonic=\u30DB\u30FC\u30E0
 FileChooser.homeFolderAccessibleName=\u30DB\u30FC\u30E0
-FileChooser.newFolderToolTipText=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210
+FileChooser.newFolderToolTip.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210
 FileChooser.newFolderAccessibleName=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.newFolderActionLabelText=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.listViewButtonToolTipText=\u30EA\u30B9\u30C8
+FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
+FileChooser.listViewButtonToolTip.textAndMnemonic=\u30EA\u30B9\u30C8
 FileChooser.listViewButtonAccessibleName=\u30EA\u30B9\u30C8
-FileChooser.listViewActionLabelText=\u30EA\u30B9\u30C8
-FileChooser.detailsViewButtonToolTipText=\u8A73\u7D30
+FileChooser.listViewActionLabel.textAndMnemonic=\u30EA\u30B9\u30C8
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30
 FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30
-FileChooser.detailsViewActionLabelText=\u8A73\u7D30
-FileChooser.refreshActionLabelText=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5
-FileChooser.viewMenuLabelText=\u8868\u793A
-FileChooser.fileNameHeaderText=\u540D\u524D
-FileChooser.fileSizeHeaderText=\u30B5\u30A4\u30BA
-FileChooser.fileTypeHeaderText=\u30BF\u30A4\u30D7
-FileChooser.fileDateHeaderText=\u4FEE\u6B63\u65E5
-FileChooser.fileAttrHeaderText=\u5C5E\u6027
+FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30
+FileChooser.refreshActionLabel.textAndMnemonic=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5
+FileChooser.viewMenuLabel.textAndMnemonic=\u8868\u793A
+FileChooser.fileNameHeader.textAndMnemonic=\u540D\u524D
+FileChooser.fileSizeHeader.textAndMnemonic=\u30B5\u30A4\u30BA
+FileChooser.fileTypeHeader.textAndMnemonic=\u30BF\u30A4\u30D7
+FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6B63\u65E5
+FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027
 
 ############ Used by MetalTitlePane if rendering window decorations############
-# All mnemonics are KeyEvent.VK_XXX as integers
-MetalTitlePane.restoreTitle=\u5FA9\u5143(R)
-MetalTitlePane.restoreMnemonic=82
-MetalTitlePane.iconifyTitle=\u6700\u5C0F\u5316(E)
-MetalTitlePane.iconifyMnemonic=69
-MetalTitlePane.maximizeTitle=\u6700\u5927\u5316(X)
-MetalTitlePane.maximizeMnemonic=88
-MetalTitlePane.closeTitle=\u9589\u3058\u308B(C)
-MetalTitlePane.closeMnemonic=67
+MetalTitlePane.restore.titleAndMnemonic=\u5FA9\u5143(&R)
+MetalTitlePane.iconify.titleAndMnemonic=\u6700\u5C0F\u5316(&E)
+MetalTitlePane.maximize.titleAndMnemonic=\u6700\u5927\u5316(&X)
+MetalTitlePane.close.titleAndMnemonic=\u9589\u3058\u308B(&C)
 

src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties

@@ -18,44 +18,35 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=\uAC80\uC0C9 \uC704\uCE58:
-FileChooser.lookInLabelMnemonic=73
-FileChooser.saveInLabelText=\uC800\uC7A5 \uC704\uCE58:
-FileChooser.fileNameLabelText=\uD30C\uC77C \uC774\uB984:
-FileChooser.fileNameLabelMnemonic=78
-FileChooser.folderNameLabelText=\uD3F4\uB354 \uC774\uB984:
-FileChooser.folderNameLabelMnemonic=78
-FileChooser.filesOfTypeLabelText=\uD30C\uC77C \uC720\uD615:
-FileChooser.filesOfTypeLabelMnemonic=84
-FileChooser.upFolderToolTipText=\uD55C \uB808\uBCA8 \uC704\uB85C
+FileChooser.lookInLabel.textAndMnemonic=\uAC80\uC0C9 \uC704\uCE58(&I):
+FileChooser.saveInLabel.textAndMnemonic=\uC800\uC7A5 \uC704\uCE58:
+FileChooser.fileNameLabel.textAndMnemonic=\uD30C\uC77C \uC774\uB984(&N):
+FileChooser.folderNameLabel.textAndMnemonic=\uD3F4\uB354 \uC774\uB984(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=\uD30C\uC77C \uC720\uD615(&T):
+FileChooser.upFolderToolTip.textAndMnemonic=\uD55C \uB808\uBCA8 \uC704\uB85C
 FileChooser.upFolderAccessibleName=\uC704\uB85C
-FileChooser.homeFolderToolTipText=\uD648
+FileChooser.homeFolderToolTip.textAndMnemonic=\uD648
 FileChooser.homeFolderAccessibleName=\uD648
-FileChooser.newFolderToolTipText=\uC0C8 \uD3F4\uB354 \uC0DD\uC131
+FileChooser.newFolderToolTip.textAndMnemonic=\uC0C8 \uD3F4\uB354 \uC0DD\uC131
 FileChooser.newFolderAccessibleName=\uC0C8 \uD3F4\uB354
-FileChooser.newFolderActionLabelText=\uC0C8 \uD3F4\uB354
-FileChooser.listViewButtonToolTipText=\uBAA9\uB85D
+FileChooser.newFolderActionLabel.textAndMnemonic=\uC0C8 \uD3F4\uB354
+FileChooser.listViewButtonToolTip.textAndMnemonic=\uBAA9\uB85D
 FileChooser.listViewButtonAccessibleName=\uBAA9\uB85D
-FileChooser.listViewActionLabelText=\uBAA9\uB85D
-FileChooser.detailsViewButtonToolTipText=\uC138\uBD80 \uC815\uBCF4
+FileChooser.listViewActionLabel.textAndMnemonic=\uBAA9\uB85D
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=\uC138\uBD80 \uC815\uBCF4
 FileChooser.detailsViewButtonAccessibleName=\uC138\uBD80 \uC815\uBCF4
-FileChooser.detailsViewActionLabelText=\uC138\uBD80 \uC815\uBCF4
-FileChooser.refreshActionLabelText=\uC0C8\uB85C \uACE0\uCE68
-FileChooser.viewMenuLabelText=\uBCF4\uAE30
-FileChooser.fileNameHeaderText=\uC774\uB984
-FileChooser.fileSizeHeaderText=\uD06C\uAE30
-FileChooser.fileTypeHeaderText=\uC720\uD615
-FileChooser.fileDateHeaderText=\uC218\uC815 \uB0A0\uC9DC
-FileChooser.fileAttrHeaderText=\uC18D\uC131
+FileChooser.detailsViewActionLabel.textAndMnemonic=\uC138\uBD80 \uC815\uBCF4
+FileChooser.refreshActionLabel.textAndMnemonic=\uC0C8\uB85C \uACE0\uCE68
+FileChooser.viewMenuLabel.textAndMnemonic=\uBCF4\uAE30
+FileChooser.fileNameHeader.textAndMnemonic=\uC774\uB984
+FileChooser.fileSizeHeader.textAndMnemonic=\uD06C\uAE30
+FileChooser.fileTypeHeader.textAndMnemonic=\uC720\uD615
+FileChooser.fileDateHeader.textAndMnemonic=\uC218\uC815 \uB0A0\uC9DC
+FileChooser.fileAttrHeader.textAndMnemonic=\uC18D\uC131
 
 ############ Used by MetalTitlePane if rendering window decorations############
-# All mnemonics are KeyEvent.VK_XXX as integers
-MetalTitlePane.restoreTitle=\uBCF5\uC6D0(R)
-MetalTitlePane.restoreMnemonic=82
-MetalTitlePane.iconifyTitle=\uCD5C\uC18C\uD654(E)
-MetalTitlePane.iconifyMnemonic=69
-MetalTitlePane.maximizeTitle=\uCD5C\uB300\uD654(X)
-MetalTitlePane.maximizeMnemonic=88
-MetalTitlePane.closeTitle=\uB2EB\uAE30(C)
-MetalTitlePane.closeMnemonic=67
+MetalTitlePane.restore.titleAndMnemonic=\uBCF5\uC6D0(&R)
+MetalTitlePane.iconify.titleAndMnemonic=\uCD5C\uC18C\uD654(&E)
+MetalTitlePane.maximize.titleAndMnemonic=\uCD5C\uB300\uD654(&X)
+MetalTitlePane.close.titleAndMnemonic=\uB2EB\uAE30(&C)
 

src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties

@@ -18,44 +18,35 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=Consultar Em:
-FileChooser.lookInLabelMnemonic=73
-FileChooser.saveInLabelText=Salvar Em:
-FileChooser.fileNameLabelText=Nome do Arquivo:
-FileChooser.fileNameLabelMnemonic=78
-FileChooser.folderNameLabelText=Nome da pasta:
-FileChooser.folderNameLabelMnemonic=78
-FileChooser.filesOfTypeLabelText=Arquivos do Tipo:
-FileChooser.filesOfTypeLabelMnemonic=84
-FileChooser.upFolderToolTipText=Um N\u00EDvel Acima
+FileChooser.lookInLabel.textAndMnemonic=Consultar Em(&I):
+FileChooser.saveInLabel.textAndMnemonic=Salvar Em:
+FileChooser.fileNameLabel.textAndMnemonic=&Nome do Arquivo:
+FileChooser.folderNameLabel.textAndMnemonic=&Nome da pasta:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Arquivos do &Tipo:
+FileChooser.upFolderToolTip.textAndMnemonic=Um N\u00EDvel Acima
 FileChooser.upFolderAccessibleName=Acima
-FileChooser.homeFolderToolTipText=In\u00EDcio
+FileChooser.homeFolderToolTip.textAndMnemonic=In\u00EDcio
 FileChooser.homeFolderAccessibleName=In\u00EDcio
-FileChooser.newFolderToolTipText=Criar Nova Pasta
+FileChooser.newFolderToolTip.textAndMnemonic=Criar Nova Pasta
 FileChooser.newFolderAccessibleName=Nova Pasta
-FileChooser.newFolderActionLabelText=Nova Pasta
-FileChooser.listViewButtonToolTipText=Lista
+FileChooser.newFolderActionLabel.textAndMnemonic=Nova Pasta
+FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
 FileChooser.listViewButtonAccessibleName=Lista
-FileChooser.listViewActionLabelText=Lista
-FileChooser.detailsViewButtonToolTipText=Detalhes
+FileChooser.listViewActionLabel.textAndMnemonic=Lista
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detalhes
 FileChooser.detailsViewButtonAccessibleName=Detalhes
-FileChooser.detailsViewActionLabelText=Detalhes
-FileChooser.refreshActionLabelText=Atualizar
-FileChooser.viewMenuLabelText=Exibir
-FileChooser.fileNameHeaderText=Nome
-FileChooser.fileSizeHeaderText=Tamanho
-FileChooser.fileTypeHeaderText=Tipo
-FileChooser.fileDateHeaderText=Modificado
-FileChooser.fileAttrHeaderText=Atributos
+FileChooser.detailsViewActionLabel.textAndMnemonic=Detalhes
+FileChooser.refreshActionLabel.textAndMnemonic=Atualizar
+FileChooser.viewMenuLabel.textAndMnemonic=Exibir
+FileChooser.fileNameHeader.textAndMnemonic=Nome
+FileChooser.fileSizeHeader.textAndMnemonic=Tamanho
+FileChooser.fileTypeHeader.textAndMnemonic=Tipo
+FileChooser.fileDateHeader.textAndMnemonic=Modificado
+FileChooser.fileAttrHeader.textAndMnemonic=Atributos
 
 ############ Used by MetalTitlePane if rendering window decorations############
-# All mnemonics are KeyEvent.VK_XXX as integers
-MetalTitlePane.restoreTitle=Restaurar
-MetalTitlePane.restoreMnemonic=82
-MetalTitlePane.iconifyTitle=Minimizar
-MetalTitlePane.iconifyMnemonic=77
-MetalTitlePane.maximizeTitle=Maximizar
-MetalTitlePane.maximizeMnemonic=88
-MetalTitlePane.closeTitle=Fechar
-MetalTitlePane.closeMnemonic=70
+MetalTitlePane.restore.titleAndMnemonic=&Restaurar
+MetalTitlePane.iconify.titleAndMnemonic=&Minimizar
+MetalTitlePane.maximize.titleAndMnemonic=Ma&ximizar
+MetalTitlePane.close.titleAndMnemonic=&Fechar
 

src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties

@@ -18,44 +18,35 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=Leta i:
-FileChooser.lookInLabelMnemonic=73
-FileChooser.saveInLabelText=Spara i:
-FileChooser.fileNameLabelText=Filnamn:
-FileChooser.fileNameLabelMnemonic=78
-FileChooser.folderNameLabelText=Mapp:
-FileChooser.folderNameLabelMnemonic=78
-FileChooser.filesOfTypeLabelText=Filformat:
-FileChooser.filesOfTypeLabelMnemonic=84
-FileChooser.upFolderToolTipText=Upp en niv\u00E5
+FileChooser.lookInLabel.textAndMnemonic=Leta &i:
+FileChooser.saveInLabel.textAndMnemonic=Spara i:
+FileChooser.fileNameLabel.textAndMnemonic=Fil&namn:
+FileChooser.folderNameLabel.textAndMnemonic=Mapp(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=Filforma&t:
+FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5
 FileChooser.upFolderAccessibleName=Upp
-FileChooser.homeFolderToolTipText=Hem
+FileChooser.homeFolderToolTip.textAndMnemonic=Hem
 FileChooser.homeFolderAccessibleName=Hem
-FileChooser.newFolderToolTipText=Skapa ny mapp
+FileChooser.newFolderToolTip.textAndMnemonic=Skapa ny mapp
 FileChooser.newFolderAccessibleName=Ny mapp
-FileChooser.newFolderActionLabelText=Ny mapp
-FileChooser.listViewButtonToolTipText=Lista
+FileChooser.newFolderActionLabel.textAndMnemonic=Ny mapp
+FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
 FileChooser.listViewButtonAccessibleName=Lista
-FileChooser.listViewActionLabelText=Lista
-FileChooser.detailsViewButtonToolTipText=Detaljer
+FileChooser.listViewActionLabel.textAndMnemonic=Lista
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detaljer
 FileChooser.detailsViewButtonAccessibleName=Detaljer
-FileChooser.detailsViewActionLabelText=Detaljer
-FileChooser.refreshActionLabelText=F\u00F6rnya
-FileChooser.viewMenuLabelText=Vy
-FileChooser.fileNameHeaderText=Namn
-FileChooser.fileSizeHeaderText=Storlek
-FileChooser.fileTypeHeaderText=Typ
-FileChooser.fileDateHeaderText=\u00C4ndrad
-FileChooser.fileAttrHeaderText=Attribut
+FileChooser.detailsViewActionLabel.textAndMnemonic=Detaljer
+FileChooser.refreshActionLabel.textAndMnemonic=F\u00F6rnya
+FileChooser.viewMenuLabel.textAndMnemonic=Vy
+FileChooser.fileNameHeader.textAndMnemonic=Namn
+FileChooser.fileSizeHeader.textAndMnemonic=Storlek
+FileChooser.fileTypeHeader.textAndMnemonic=Typ
+FileChooser.fileDateHeader.textAndMnemonic=\u00C4ndrad
+FileChooser.fileAttrHeader.textAndMnemonic=Attribut
 
 ############ Used by MetalTitlePane if rendering window decorations############
-# All mnemonics are KeyEvent.VK_XXX as integers
-MetalTitlePane.restoreTitle=\u00C5terst\u00E4ll
-MetalTitlePane.restoreMnemonic=82
-MetalTitlePane.iconifyTitle=Minimera
-MetalTitlePane.iconifyMnemonic=69
-MetalTitlePane.maximizeTitle=Maximera
-MetalTitlePane.maximizeMnemonic=88
-MetalTitlePane.closeTitle=St\u00E4ng
-MetalTitlePane.closeMnemonic=83
+MetalTitlePane.restore.titleAndMnemonic=\u00C5terst\u00E4ll(&R)
+MetalTitlePane.iconify.titleAndMnemonic=Minim&era
+MetalTitlePane.maximize.titleAndMnemonic=Ma&ximera
+MetalTitlePane.close.titleAndMnemonic=St\u00E4ng(&S)
 

src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties

@@ -18,44 +18,35 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=\u67E5\u770B:
-FileChooser.lookInLabelMnemonic=73
-FileChooser.saveInLabelText=\u4FDD\u5B58:
-FileChooser.fileNameLabelText=\u6587\u4EF6\u540D:
-FileChooser.fileNameLabelMnemonic=78
-FileChooser.folderNameLabelText=\u6587\u4EF6\u5939\u540D:
-FileChooser.folderNameLabelMnemonic=78
-FileChooser.filesOfTypeLabelText=\u6587\u4EF6\u7C7B\u578B:
-FileChooser.filesOfTypeLabelMnemonic=84
-FileChooser.upFolderToolTipText=\u5411\u4E0A\u4E00\u7EA7
+FileChooser.lookInLabel.textAndMnemonic=\u67E5\u770B(&I):
+FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58:
+FileChooser.fileNameLabel.textAndMnemonic=\u6587\u4EF6\u540D(&N):
+FileChooser.folderNameLabel.textAndMnemonic=\u6587\u4EF6\u5939\u540D(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=\u6587\u4EF6\u7C7B\u578B(&T):
+FileChooser.upFolderToolTip.textAndMnemonic=\u5411\u4E0A\u4E00\u7EA7
 FileChooser.upFolderAccessibleName=\u5411\u4E0A
-FileChooser.homeFolderToolTipText=\u4E3B\u76EE\u5F55
+FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u5F55
 FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u5F55
-FileChooser.newFolderToolTipText=\u521B\u5EFA\u65B0\u6587\u4EF6\u5939
+FileChooser.newFolderToolTip.textAndMnemonic=\u521B\u5EFA\u65B0\u6587\u4EF6\u5939
 FileChooser.newFolderAccessibleName=\u65B0\u5EFA\u6587\u4EF6\u5939
-FileChooser.newFolderActionLabelText=\u65B0\u5EFA\u6587\u4EF6\u5939
-FileChooser.listViewButtonToolTipText=\u5217\u8868
+FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u5EFA\u6587\u4EF6\u5939
+FileChooser.listViewButtonToolTip.textAndMnemonic=\u5217\u8868
 FileChooser.listViewButtonAccessibleName=\u5217\u8868
-FileChooser.listViewActionLabelText=\u5217\u8868
-FileChooser.detailsViewButtonToolTipText=\u8BE6\u7EC6\u8D44\u6599
+FileChooser.listViewActionLabel.textAndMnemonic=\u5217\u8868
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8BE6\u7EC6\u8D44\u6599
 FileChooser.detailsViewButtonAccessibleName=\u8BE6\u7EC6\u8D44\u6599
-FileChooser.detailsViewActionLabelText=\u8BE6\u7EC6\u8D44\u6599
-FileChooser.refreshActionLabelText=\u5237\u65B0
-FileChooser.viewMenuLabelText=\u89C6\u56FE
-FileChooser.fileNameHeaderText=\u540D\u79F0
-FileChooser.fileSizeHeaderText=\u5927\u5C0F
-FileChooser.fileTypeHeaderText=\u7C7B\u578B
-FileChooser.fileDateHeaderText=\u4FEE\u6539\u65E5\u671F
-FileChooser.fileAttrHeaderText=\u5C5E\u6027
+FileChooser.detailsViewActionLabel.textAndMnemonic=\u8BE6\u7EC6\u8D44\u6599
+FileChooser.refreshActionLabel.textAndMnemonic=\u5237\u65B0
+FileChooser.viewMenuLabel.textAndMnemonic=\u89C6\u56FE
+FileChooser.fileNameHeader.textAndMnemonic=\u540D\u79F0
+FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F
+FileChooser.fileTypeHeader.textAndMnemonic=\u7C7B\u578B
+FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
+FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027
 
 ############ Used by MetalTitlePane if rendering window decorations############
-# All mnemonics are KeyEvent.VK_XXX as integers
-MetalTitlePane.restoreTitle=\u8FD8\u539F(R)
-MetalTitlePane.restoreMnemonic=82
-MetalTitlePane.iconifyTitle=\u6700\u5C0F\u5316(E)
-MetalTitlePane.iconifyMnemonic=69
-MetalTitlePane.maximizeTitle=\u6700\u5927\u5316(X)
-MetalTitlePane.maximizeMnemonic=88
-MetalTitlePane.closeTitle=\u5173\u95ED(C)
-MetalTitlePane.closeMnemonic=67
+MetalTitlePane.restore.titleAndMnemonic=\u8FD8\u539F(&R)
+MetalTitlePane.iconify.titleAndMnemonic=\u6700\u5C0F\u5316(&E)
+MetalTitlePane.maximize.titleAndMnemonic=\u6700\u5927\u5316(&X)
+MetalTitlePane.close.titleAndMnemonic=\u5173\u95ED(&C)
 

src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties

@@ -18,44 +18,35 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=\u67E5\u8A62:
-FileChooser.lookInLabelMnemonic=73
-FileChooser.saveInLabelText=\u5132\u5B58\u65BC:
-FileChooser.fileNameLabelText=\u6A94\u6848\u540D\u7A31:
-FileChooser.fileNameLabelMnemonic=78
-FileChooser.folderNameLabelText=\u8CC7\u6599\u593E\u540D\u7A31:
-FileChooser.folderNameLabelMnemonic=78
-FileChooser.filesOfTypeLabelText=\u6A94\u6848\u985E\u578B:
-FileChooser.filesOfTypeLabelMnemonic=84
-FileChooser.upFolderToolTipText=\u5F80\u4E0A\u4E00\u5C64
+FileChooser.lookInLabel.textAndMnemonic=\u67E5\u8A62(&I):
+FileChooser.saveInLabel.textAndMnemonic=\u5132\u5B58\u65BC:
+FileChooser.fileNameLabel.textAndMnemonic=\u6A94\u6848\u540D\u7A31(&N):
+FileChooser.folderNameLabel.textAndMnemonic=\u8CC7\u6599\u593E\u540D\u7A31(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=\u6A94\u6848\u985E\u578B(&T):
+FileChooser.upFolderToolTip.textAndMnemonic=\u5F80\u4E0A\u4E00\u5C64
 FileChooser.upFolderAccessibleName=\u5F80\u4E0A
-FileChooser.homeFolderToolTipText=\u4E3B\u76EE\u9304
+FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u9304
 FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u9304
-FileChooser.newFolderToolTipText=\u5EFA\u7ACB\u65B0\u8CC7\u6599\u593E
+FileChooser.newFolderToolTip.textAndMnemonic=\u5EFA\u7ACB\u65B0\u8CC7\u6599\u593E
 FileChooser.newFolderAccessibleName=\u65B0\u8CC7\u6599\u593E
-FileChooser.newFolderActionLabelText=\u65B0\u8CC7\u6599\u593E
-FileChooser.listViewButtonToolTipText=\u6E05\u55AE
+FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u8CC7\u6599\u593E
+FileChooser.listViewButtonToolTip.textAndMnemonic=\u6E05\u55AE
 FileChooser.listViewButtonAccessibleName=\u6E05\u55AE
-FileChooser.listViewActionLabelText=\u6E05\u55AE
-FileChooser.detailsViewButtonToolTipText=\u8A73\u7D30\u8CC7\u8A0A
+FileChooser.listViewActionLabel.textAndMnemonic=\u6E05\u55AE
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A
 FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30\u8CC7\u8A0A
-FileChooser.detailsViewActionLabelText=\u8A73\u7D30\u8CC7\u8A0A
-FileChooser.refreshActionLabelText=\u91CD\u65B0\u6574\u7406
-FileChooser.viewMenuLabelText=\u6AA2\u8996
-FileChooser.fileNameHeaderText=\u540D\u7A31
-FileChooser.fileSizeHeaderText=\u5927\u5C0F
-FileChooser.fileTypeHeaderText=\u985E\u578B
-FileChooser.fileDateHeaderText=\u4FEE\u6539\u65E5\u671F
-FileChooser.fileAttrHeaderText=\u5C6C\u6027
+FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A
+FileChooser.refreshActionLabel.textAndMnemonic=\u91CD\u65B0\u6574\u7406
+FileChooser.viewMenuLabel.textAndMnemonic=\u6AA2\u8996
+FileChooser.fileNameHeader.textAndMnemonic=\u540D\u7A31
+FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F
+FileChooser.fileTypeHeader.textAndMnemonic=\u985E\u578B
+FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
+FileChooser.fileAttrHeader.textAndMnemonic=\u5C6C\u6027
 
 ############ Used by MetalTitlePane if rendering window decorations############
-# All mnemonics are KeyEvent.VK_XXX as integers
-MetalTitlePane.restoreTitle=\u56DE\u5FA9(R)
-MetalTitlePane.restoreMnemonic=82
-MetalTitlePane.iconifyTitle=\u6700\u5C0F\u5316(E)
-MetalTitlePane.iconifyMnemonic=69
-MetalTitlePane.maximizeTitle=\u6700\u5927\u5316(X)
-MetalTitlePane.maximizeMnemonic=88
-MetalTitlePane.closeTitle=\u95DC\u9589(C)
-MetalTitlePane.closeMnemonic=67
+MetalTitlePane.restore.titleAndMnemonic=\u56DE\u5FA9(&R)
+MetalTitlePane.iconify.titleAndMnemonic=\u6700\u5C0F\u5316(&E)
+MetalTitlePane.maximize.titleAndMnemonic=\u6700\u5927\u5316(&X)
+MetalTitlePane.close.titleAndMnemonic=\u95DC\u9589(&C)
 

src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties

@@ -18,32 +18,28 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=Look In:
-FileChooser.lookInLabelMnemonic=73
-FileChooser.saveInLabelText=Save In:
-FileChooser.fileNameLabelText=File Name:
-FileChooser.fileNameLabelMnemonic=78
-FileChooser.folderNameLabelText=Folder Name:
-FileChooser.folderNameLabelMnemonic=78
-FileChooser.filesOfTypeLabelText=Files of Type:
-FileChooser.filesOfTypeLabelMnemonic=84
-FileChooser.upFolderToolTipText=Up One Level
+FileChooser.lookInLabel.textAndMnemonic=Look &In:
+FileChooser.saveInLabel.textAndMnemonic=Save In:
+FileChooser.fileNameLabel.textAndMnemonic=File &Name:
+FileChooser.folderNameLabel.textAndMnemonic=Folder &Name:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Files of &Type:
+FileChooser.upFolderToolTip.textAndMnemonic=Up One Level
 FileChooser.upFolderAccessibleName=Up
-FileChooser.homeFolderToolTipText=Home
+FileChooser.homeFolderToolTip.textAndMnemonic=Home
 FileChooser.homeFolderAccessibleName=Home
-FileChooser.newFolderToolTipText=Create New Folder
+FileChooser.newFolderToolTip.textAndMnemonic=Create New Folder
 FileChooser.newFolderAccessibleName=New Folder
-FileChooser.newFolderActionLabelText=New Folder
-FileChooser.listViewButtonToolTipText=List
+FileChooser.newFolderActionLabel.textAndMnemonic=New Folder
+FileChooser.listViewButtonToolTip.textAndMnemonic=List
 FileChooser.listViewButtonAccessibleName=List
-FileChooser.listViewActionLabelText=List
-FileChooser.detailsViewButtonToolTipText=Details
+FileChooser.listViewActionLabel.textAndMnemonic=List
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Details
 FileChooser.detailsViewButtonAccessibleName=Details
-FileChooser.detailsViewActionLabelText=Details
-FileChooser.refreshActionLabelText=Refresh
-FileChooser.viewMenuLabelText=View
-FileChooser.fileNameHeaderText=Name
-FileChooser.fileSizeHeaderText=Size
-FileChooser.fileTypeHeaderText=Type
-FileChooser.fileDateHeaderText=Modified
-FileChooser.fileAttrHeaderText=Attributes
+FileChooser.detailsViewActionLabel.textAndMnemonic=Details
+FileChooser.refreshActionLabel.textAndMnemonic=Refresh
+FileChooser.viewMenuLabel.textAndMnemonic=View
+FileChooser.fileNameHeader.textAndMnemonic=Name
+FileChooser.fileSizeHeader.textAndMnemonic=Size
+FileChooser.fileTypeHeader.textAndMnemonic=Type
+FileChooser.fileDateHeader.textAndMnemonic=Modified
+FileChooser.fileAttrHeader.textAndMnemonic=Attributes

src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties

@@ -18,32 +18,28 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=Suchen in:
-FileChooser.lookInLabelMnemonic=73
-FileChooser.saveInLabelText=Speichern in:
-FileChooser.fileNameLabelText=Dateiname:
-FileChooser.fileNameLabelMnemonic=78
-FileChooser.folderNameLabelText=Ordnername:
-FileChooser.folderNameLabelMnemonic=78
-FileChooser.filesOfTypeLabelText=Dateityp:
-FileChooser.filesOfTypeLabelMnemonic=84
-FileChooser.upFolderToolTipText=Eine Ebene h\u00F6her
+FileChooser.lookInLabel.textAndMnemonic=Suchen &in:
+FileChooser.saveInLabel.textAndMnemonic=Speichern in:
+FileChooser.fileNameLabel.textAndMnemonic=Datei&name:
+FileChooser.folderNameLabel.textAndMnemonic=Ord&nername:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Da&teityp:
+FileChooser.upFolderToolTip.textAndMnemonic=Eine Ebene h\u00F6her
 FileChooser.upFolderAccessibleName=Nach oben
-FileChooser.homeFolderToolTipText=Home
+FileChooser.homeFolderToolTip.textAndMnemonic=Home
 FileChooser.homeFolderAccessibleName=Home
-FileChooser.newFolderToolTipText=Neuen Ordner erstellen
+FileChooser.newFolderToolTip.textAndMnemonic=Neuen Ordner erstellen
 FileChooser.newFolderAccessibleName=Neuer Ordner
-FileChooser.newFolderActionLabelText=Neuer Ordner
-FileChooser.listViewButtonToolTipText=Liste
+FileChooser.newFolderActionLabel.textAndMnemonic=Neuer Ordner
+FileChooser.listViewButtonToolTip.textAndMnemonic=Liste
 FileChooser.listViewButtonAccessibleName=Liste
-FileChooser.listViewActionLabelText=Liste
-FileChooser.detailsViewButtonToolTipText=Details
+FileChooser.listViewActionLabel.textAndMnemonic=Liste
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Details
 FileChooser.detailsViewButtonAccessibleName=Details
-FileChooser.detailsViewActionLabelText=Details
-FileChooser.refreshActionLabelText=Aktualisieren
-FileChooser.viewMenuLabelText=Ansicht
-FileChooser.fileNameHeaderText=Name
-FileChooser.fileSizeHeaderText=Gr\u00F6\u00DFe
-FileChooser.fileTypeHeaderText=Typ
-FileChooser.fileDateHeaderText=Ge\u00E4ndert
-FileChooser.fileAttrHeaderText=Attribute
+FileChooser.detailsViewActionLabel.textAndMnemonic=Details
+FileChooser.refreshActionLabel.textAndMnemonic=Aktualisieren
+FileChooser.viewMenuLabel.textAndMnemonic=Ansicht
+FileChooser.fileNameHeader.textAndMnemonic=Name
+FileChooser.fileSizeHeader.textAndMnemonic=Gr\u00F6\u00DFe
+FileChooser.fileTypeHeader.textAndMnemonic=Typ
+FileChooser.fileDateHeader.textAndMnemonic=Ge\u00E4ndert
+FileChooser.fileAttrHeader.textAndMnemonic=Attribute

src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties

@@ -18,32 +18,28 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=Buscar en:
-FileChooser.lookInLabelMnemonic=73
-FileChooser.saveInLabelText=Guardar en:
-FileChooser.fileNameLabelText=Nombre de Archivo:
-FileChooser.fileNameLabelMnemonic=78
-FileChooser.folderNameLabelText=Nombre de la Carpeta:
-FileChooser.folderNameLabelMnemonic=78
-FileChooser.filesOfTypeLabelText=Archivos de Tipo:
-FileChooser.filesOfTypeLabelMnemonic=84
-FileChooser.upFolderToolTipText=Subir un Nivel
+FileChooser.lookInLabel.textAndMnemonic=Buscar en(&I):
+FileChooser.saveInLabel.textAndMnemonic=Guardar en:
+FileChooser.fileNameLabel.textAndMnemonic=&Nombre de Archivo:
+FileChooser.folderNameLabel.textAndMnemonic=&Nombre de la Carpeta:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Archivos de &Tipo:
+FileChooser.upFolderToolTip.textAndMnemonic=Subir un Nivel
 FileChooser.upFolderAccessibleName=Arriba
-FileChooser.homeFolderToolTipText=Inicio
+FileChooser.homeFolderToolTip.textAndMnemonic=Inicio
 FileChooser.homeFolderAccessibleName=Inicio
-FileChooser.newFolderToolTipText=Crear Nueva Carpeta
+FileChooser.newFolderToolTip.textAndMnemonic=Crear Nueva Carpeta
 FileChooser.newFolderAccessibleName=Nueva Carpeta
-FileChooser.newFolderActionLabelText=Nueva Carpeta
-FileChooser.listViewButtonToolTipText=Lista
+FileChooser.newFolderActionLabel.textAndMnemonic=Nueva Carpeta
+FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
 FileChooser.listViewButtonAccessibleName=Lista
-FileChooser.listViewActionLabelText=Lista
-FileChooser.detailsViewButtonToolTipText=Detalles
+FileChooser.listViewActionLabel.textAndMnemonic=Lista
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detalles
 FileChooser.detailsViewButtonAccessibleName=Detalles
-FileChooser.detailsViewActionLabelText=Detalles
-FileChooser.refreshActionLabelText=Refrescar
-FileChooser.viewMenuLabelText=Ver
-FileChooser.fileNameHeaderText=Nombre
-FileChooser.fileSizeHeaderText=Tama\u00F1o
-FileChooser.fileTypeHeaderText=Tipo
-FileChooser.fileDateHeaderText=Modificado
-FileChooser.fileAttrHeaderText=Atributos
+FileChooser.detailsViewActionLabel.textAndMnemonic=Detalles
+FileChooser.refreshActionLabel.textAndMnemonic=Refrescar
+FileChooser.viewMenuLabel.textAndMnemonic=Ver
+FileChooser.fileNameHeader.textAndMnemonic=Nombre
+FileChooser.fileSizeHeader.textAndMnemonic=Tama\u00F1o
+FileChooser.fileTypeHeader.textAndMnemonic=Tipo
+FileChooser.fileDateHeader.textAndMnemonic=Modificado
+FileChooser.fileAttrHeader.textAndMnemonic=Atributos

src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties

@@ -18,32 +18,28 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=Rechercher dans :
-FileChooser.lookInLabelMnemonic=73
-FileChooser.saveInLabelText=Enregistrer dans :
-FileChooser.fileNameLabelText=Nom du fichier :
-FileChooser.fileNameLabelMnemonic=78
-FileChooser.folderNameLabelText=Nom du dossier :
-FileChooser.folderNameLabelMnemonic=78
-FileChooser.filesOfTypeLabelText=Fichiers de type :
-FileChooser.filesOfTypeLabelMnemonic=84
-FileChooser.upFolderToolTipText=Remonte d'un niveau.
+FileChooser.lookInLabel.textAndMnemonic=Rechercher dans (&I):
+FileChooser.saveInLabel.textAndMnemonic=Enregistrer dans :
+FileChooser.fileNameLabel.textAndMnemonic=&Nom du fichier :
+FileChooser.folderNameLabel.textAndMnemonic=&Nom du dossier :
+FileChooser.filesOfTypeLabel.textAndMnemonic=Fichiers de &type :
+FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau.
 FileChooser.upFolderAccessibleName=Monter
-FileChooser.homeFolderToolTipText=R\u00E9pertoire d'origine
+FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire d'origine
 FileChooser.homeFolderAccessibleName=R\u00E9pertoire d'origine
-FileChooser.newFolderToolTipText=Cr\u00E9e un dossier.
+FileChooser.newFolderToolTip.textAndMnemonic=Cr\u00E9e un dossier.
 FileChooser.newFolderAccessibleName=Nouveau dossier
-FileChooser.newFolderActionLabelText=Nouveau dossier
-FileChooser.listViewButtonToolTipText=Liste
+FileChooser.newFolderActionLabel.textAndMnemonic=Nouveau dossier
+FileChooser.listViewButtonToolTip.textAndMnemonic=Liste
 FileChooser.listViewButtonAccessibleName=Liste
-FileChooser.listViewActionLabelText=Liste
-FileChooser.detailsViewButtonToolTipText=D\u00E9tails
+FileChooser.listViewActionLabel.textAndMnemonic=Liste
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=D\u00E9tails
 FileChooser.detailsViewButtonAccessibleName=D\u00E9tails
-FileChooser.detailsViewActionLabelText=D\u00E9tails
-FileChooser.refreshActionLabelText=Actualiser
-FileChooser.viewMenuLabelText=Affichage
-FileChooser.fileNameHeaderText=Nom
-FileChooser.fileSizeHeaderText=Taille
-FileChooser.fileTypeHeaderText=Type
-FileChooser.fileDateHeaderText=Modifi\u00E9
-FileChooser.fileAttrHeaderText=Attributs
+FileChooser.detailsViewActionLabel.textAndMnemonic=D\u00E9tails
+FileChooser.refreshActionLabel.textAndMnemonic=Actualiser
+FileChooser.viewMenuLabel.textAndMnemonic=Affichage
+FileChooser.fileNameHeader.textAndMnemonic=Nom
+FileChooser.fileSizeHeader.textAndMnemonic=Taille
+FileChooser.fileTypeHeader.textAndMnemonic=Type
+FileChooser.fileDateHeader.textAndMnemonic=Modifi\u00E9
+FileChooser.fileAttrHeader.textAndMnemonic=Attributs

src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.properties

@@ -18,32 +18,28 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=Cerca in:
-FileChooser.lookInLabelMnemonic=73
-FileChooser.saveInLabelText=Salva in:
-FileChooser.fileNameLabelText=Nome file:
-FileChooser.fileNameLabelMnemonic=78
-FileChooser.folderNameLabelText=Nome della cartella:
-FileChooser.folderNameLabelMnemonic=78
-FileChooser.filesOfTypeLabelText=Tipo file:
-FileChooser.filesOfTypeLabelMnemonic=84
-FileChooser.upFolderToolTipText=Cartella superiore
+FileChooser.lookInLabel.textAndMnemonic=Cerca &in:
+FileChooser.saveInLabel.textAndMnemonic=Salva in:
+FileChooser.fileNameLabel.textAndMnemonic=&Nome file:
+FileChooser.folderNameLabel.textAndMnemonic=&Nome della cartella:
+FileChooser.filesOfTypeLabel.textAndMnemonic=&Tipo file:
+FileChooser.upFolderToolTip.textAndMnemonic=Cartella superiore
 FileChooser.upFolderAccessibleName=Superiore
-FileChooser.homeFolderToolTipText=Home
+FileChooser.homeFolderToolTip.textAndMnemonic=Home
 FileChooser.homeFolderAccessibleName=Home
-FileChooser.newFolderToolTipText=Crea nuova cartella
+FileChooser.newFolderToolTip.textAndMnemonic=Crea nuova cartella
 FileChooser.newFolderAccessibleName=Nuova cartella
-FileChooser.newFolderActionLabelText=Nuova cartella
-FileChooser.listViewButtonToolTipText=Lista
+FileChooser.newFolderActionLabel.textAndMnemonic=Nuova cartella
+FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
 FileChooser.listViewButtonAccessibleName=Lista
-FileChooser.listViewActionLabelText=Lista
-FileChooser.detailsViewButtonToolTipText=Dettagli
+FileChooser.listViewActionLabel.textAndMnemonic=Lista
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Dettagli
 FileChooser.detailsViewButtonAccessibleName=Dettagli
-FileChooser.detailsViewActionLabelText=Dettagli
-FileChooser.refreshActionLabelText=Aggiorna
-FileChooser.viewMenuLabelText=Visualizza
-FileChooser.fileNameHeaderText=Nome
-FileChooser.fileSizeHeaderText=Dimensioni
-FileChooser.fileTypeHeaderText=Tipo
-FileChooser.fileDateHeaderText=Modificato
-FileChooser.fileAttrHeaderText=Attributi
+FileChooser.detailsViewActionLabel.textAndMnemonic=Dettagli
+FileChooser.refreshActionLabel.textAndMnemonic=Aggiorna
+FileChooser.viewMenuLabel.textAndMnemonic=Visualizza
+FileChooser.fileNameHeader.textAndMnemonic=Nome
+FileChooser.fileSizeHeader.textAndMnemonic=Dimensioni
+FileChooser.fileTypeHeader.textAndMnemonic=Tipo
+FileChooser.fileDateHeader.textAndMnemonic=Modificato
+FileChooser.fileAttrHeader.textAndMnemonic=Attributi

src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties

@@ -18,32 +18,28 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=\u53C2\u7167:
-FileChooser.lookInLabelMnemonic=73
-FileChooser.saveInLabelText=\u4FDD\u5B58:
-FileChooser.fileNameLabelText=\u30D5\u30A1\u30A4\u30EB\u540D:
-FileChooser.fileNameLabelMnemonic=78
-FileChooser.folderNameLabelText=\u30D5\u30A9\u30EB\u30C0\u540D:
-FileChooser.folderNameLabelMnemonic=78
-FileChooser.filesOfTypeLabelText=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7:
-FileChooser.filesOfTypeLabelMnemonic=84
-FileChooser.upFolderToolTipText=1\u30EC\u30D9\u30EB\u4E0A\u3078
+FileChooser.lookInLabel.textAndMnemonic=\u53C2\u7167(&I):
+FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58:
+FileChooser.fileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u540D(&N):
+FileChooser.folderNameLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7(&T):
+FileChooser.upFolderToolTip.textAndMnemonic=1\u30EC\u30D9\u30EB\u4E0A\u3078
 FileChooser.upFolderAccessibleName=\u4E0A\u3078
-FileChooser.homeFolderToolTipText=\u30DB\u30FC\u30E0
+FileChooser.homeFolderToolTip.textAndMnemonic=\u30DB\u30FC\u30E0
 FileChooser.homeFolderAccessibleName=\u30DB\u30FC\u30E0
-FileChooser.newFolderToolTipText=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210
+FileChooser.newFolderToolTip.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210
 FileChooser.newFolderAccessibleName=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.newFolderActionLabelText=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.listViewButtonToolTipText=\u30EA\u30B9\u30C8
+FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
+FileChooser.listViewButtonToolTip.textAndMnemonic=\u30EA\u30B9\u30C8
 FileChooser.listViewButtonAccessibleName=\u30EA\u30B9\u30C8
-FileChooser.listViewActionLabelText=\u30EA\u30B9\u30C8
-FileChooser.detailsViewButtonToolTipText=\u8A73\u7D30
+FileChooser.listViewActionLabel.textAndMnemonic=\u30EA\u30B9\u30C8
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30
 FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30
-FileChooser.detailsViewActionLabelText=\u8A73\u7D30
-FileChooser.refreshActionLabelText=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5
-FileChooser.viewMenuLabelText=\u8868\u793A
-FileChooser.fileNameHeaderText=\u540D\u524D
-FileChooser.fileSizeHeaderText=\u30B5\u30A4\u30BA
-FileChooser.fileTypeHeaderText=\u30BF\u30A4\u30D7
-FileChooser.fileDateHeaderText=\u4FEE\u6B63\u65E5
-FileChooser.fileAttrHeaderText=\u5C5E\u6027
+FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30
+FileChooser.refreshActionLabel.textAndMnemonic=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5
+FileChooser.viewMenuLabel.textAndMnemonic=\u8868\u793A
+FileChooser.fileNameHeader.textAndMnemonic=\u540D\u524D
+FileChooser.fileSizeHeader.textAndMnemonic=\u30B5\u30A4\u30BA
+FileChooser.fileTypeHeader.textAndMnemonic=\u30BF\u30A4\u30D7
+FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6B63\u65E5
+FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027

src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties

@@ -18,32 +18,28 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=\uAC80\uC0C9 \uC704\uCE58:
-FileChooser.lookInLabelMnemonic=73
-FileChooser.saveInLabelText=\uC800\uC7A5 \uC704\uCE58:
-FileChooser.fileNameLabelText=\uD30C\uC77C \uC774\uB984:
-FileChooser.fileNameLabelMnemonic=78
-FileChooser.folderNameLabelText=\uD3F4\uB354 \uC774\uB984:
-FileChooser.folderNameLabelMnemonic=78
-FileChooser.filesOfTypeLabelText=\uD30C\uC77C \uC720\uD615:
-FileChooser.filesOfTypeLabelMnemonic=84
-FileChooser.upFolderToolTipText=\uD55C \uB808\uBCA8 \uC704\uB85C
+FileChooser.lookInLabel.textAndMnemonic=\uAC80\uC0C9 \uC704\uCE58(&I):
+FileChooser.saveInLabel.textAndMnemonic=\uC800\uC7A5 \uC704\uCE58:
+FileChooser.fileNameLabel.textAndMnemonic=\uD30C\uC77C \uC774\uB984(&N):
+FileChooser.folderNameLabel.textAndMnemonic=\uD3F4\uB354 \uC774\uB984(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=\uD30C\uC77C \uC720\uD615(&T):
+FileChooser.upFolderToolTip.textAndMnemonic=\uD55C \uB808\uBCA8 \uC704\uB85C
 FileChooser.upFolderAccessibleName=\uC704\uB85C
-FileChooser.homeFolderToolTipText=\uD648
+FileChooser.homeFolderToolTip.textAndMnemonic=\uD648
 FileChooser.homeFolderAccessibleName=\uD648
-FileChooser.newFolderToolTipText=\uC0C8 \uD3F4\uB354 \uC0DD\uC131
+FileChooser.newFolderToolTip.textAndMnemonic=\uC0C8 \uD3F4\uB354 \uC0DD\uC131
 FileChooser.newFolderAccessibleName=\uC0C8 \uD3F4\uB354
-FileChooser.newFolderActionLabelText=\uC0C8 \uD3F4\uB354
-FileChooser.listViewButtonToolTipText=\uBAA9\uB85D
+FileChooser.newFolderActionLabel.textAndMnemonic=\uC0C8 \uD3F4\uB354
+FileChooser.listViewButtonToolTip.textAndMnemonic=\uBAA9\uB85D
 FileChooser.listViewButtonAccessibleName=\uBAA9\uB85D
-FileChooser.listViewActionLabelText=\uBAA9\uB85D
-FileChooser.detailsViewButtonToolTipText=\uC138\uBD80 \uC815\uBCF4
+FileChooser.listViewActionLabel.textAndMnemonic=\uBAA9\uB85D
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=\uC138\uBD80 \uC815\uBCF4
 FileChooser.detailsViewButtonAccessibleName=\uC138\uBD80 \uC815\uBCF4
-FileChooser.detailsViewActionLabelText=\uC138\uBD80 \uC815\uBCF4
-FileChooser.refreshActionLabelText=\uC0C8\uB85C \uACE0\uCE68
-FileChooser.viewMenuLabelText=\uBCF4\uAE30
-FileChooser.fileNameHeaderText=\uC774\uB984
-FileChooser.fileSizeHeaderText=\uD06C\uAE30
-FileChooser.fileTypeHeaderText=\uC720\uD615
-FileChooser.fileDateHeaderText=\uC218\uC815 \uB0A0\uC9DC
-FileChooser.fileAttrHeaderText=\uC18D\uC131
+FileChooser.detailsViewActionLabel.textAndMnemonic=\uC138\uBD80 \uC815\uBCF4
+FileChooser.refreshActionLabel.textAndMnemonic=\uC0C8\uB85C \uACE0\uCE68
+FileChooser.viewMenuLabel.textAndMnemonic=\uBCF4\uAE30
+FileChooser.fileNameHeader.textAndMnemonic=\uC774\uB984
+FileChooser.fileSizeHeader.textAndMnemonic=\uD06C\uAE30
+FileChooser.fileTypeHeader.textAndMnemonic=\uC720\uD615
+FileChooser.fileDateHeader.textAndMnemonic=\uC218\uC815 \uB0A0\uC9DC
+FileChooser.fileAttrHeader.textAndMnemonic=\uC18D\uC131

src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties

@@ -18,32 +18,28 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=Consultar Em:
-FileChooser.lookInLabelMnemonic=73
-FileChooser.saveInLabelText=Salvar Em:
-FileChooser.fileNameLabelText=Nome do Arquivo:
-FileChooser.fileNameLabelMnemonic=78
-FileChooser.folderNameLabelText=Nome da pasta:
-FileChooser.folderNameLabelMnemonic=78
-FileChooser.filesOfTypeLabelText=Arquivos do Tipo:
-FileChooser.filesOfTypeLabelMnemonic=84
-FileChooser.upFolderToolTipText=Um N\u00EDvel Acima
+FileChooser.lookInLabel.textAndMnemonic=Consultar Em(&I):
+FileChooser.saveInLabel.textAndMnemonic=Salvar Em:
+FileChooser.fileNameLabel.textAndMnemonic=&Nome do Arquivo:
+FileChooser.folderNameLabel.textAndMnemonic=&Nome da pasta:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Arquivos do &Tipo:
+FileChooser.upFolderToolTip.textAndMnemonic=Um N\u00EDvel Acima
 FileChooser.upFolderAccessibleName=Acima
-FileChooser.homeFolderToolTipText=In\u00EDcio
+FileChooser.homeFolderToolTip.textAndMnemonic=In\u00EDcio
 FileChooser.homeFolderAccessibleName=In\u00EDcio
-FileChooser.newFolderToolTipText=Criar Nova Pasta
+FileChooser.newFolderToolTip.textAndMnemonic=Criar Nova Pasta
 FileChooser.newFolderAccessibleName=Nova Pasta
-FileChooser.newFolderActionLabelText=Nova Pasta
-FileChooser.listViewButtonToolTipText=Lista
+FileChooser.newFolderActionLabel.textAndMnemonic=Nova Pasta
+FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
 FileChooser.listViewButtonAccessibleName=Lista
-FileChooser.listViewActionLabelText=Lista
-FileChooser.detailsViewButtonToolTipText=Detalhes
+FileChooser.listViewActionLabel.textAndMnemonic=Lista
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detalhes
 FileChooser.detailsViewButtonAccessibleName=Detalhes
-FileChooser.detailsViewActionLabelText=Detalhes
-FileChooser.refreshActionLabelText=Atualizar
-FileChooser.viewMenuLabelText=Exibir
-FileChooser.fileNameHeaderText=Nome
-FileChooser.fileSizeHeaderText=Tamanho
-FileChooser.fileTypeHeaderText=Tipo
-FileChooser.fileDateHeaderText=Modificado
-FileChooser.fileAttrHeaderText=Atributos
+FileChooser.detailsViewActionLabel.textAndMnemonic=Detalhes
+FileChooser.refreshActionLabel.textAndMnemonic=Atualizar
+FileChooser.viewMenuLabel.textAndMnemonic=Exibir
+FileChooser.fileNameHeader.textAndMnemonic=Nome
+FileChooser.fileSizeHeader.textAndMnemonic=Tamanho
+FileChooser.fileTypeHeader.textAndMnemonic=Tipo
+FileChooser.fileDateHeader.textAndMnemonic=Modificado
+FileChooser.fileAttrHeader.textAndMnemonic=Atributos

src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties

@@ -18,32 +18,28 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=Leta i:
-FileChooser.lookInLabelMnemonic=73
-FileChooser.saveInLabelText=Spara i:
-FileChooser.fileNameLabelText=Filnamn:
-FileChooser.fileNameLabelMnemonic=78
-FileChooser.folderNameLabelText=Mapp:
-FileChooser.folderNameLabelMnemonic=78
-FileChooser.filesOfTypeLabelText=Filformat:
-FileChooser.filesOfTypeLabelMnemonic=84
-FileChooser.upFolderToolTipText=Upp en niv\u00E5
+FileChooser.lookInLabel.textAndMnemonic=Leta &i:
+FileChooser.saveInLabel.textAndMnemonic=Spara i:
+FileChooser.fileNameLabel.textAndMnemonic=Fil&namn:
+FileChooser.folderNameLabel.textAndMnemonic=Mapp(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=Filforma&t:
+FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5
 FileChooser.upFolderAccessibleName=Upp
-FileChooser.homeFolderToolTipText=Hem
+FileChooser.homeFolderToolTip.textAndMnemonic=Hem
 FileChooser.homeFolderAccessibleName=Hem
-FileChooser.newFolderToolTipText=Skapa ny mapp
+FileChooser.newFolderToolTip.textAndMnemonic=Skapa ny mapp
 FileChooser.newFolderAccessibleName=Ny mapp
-FileChooser.newFolderActionLabelText=Ny mapp
-FileChooser.listViewButtonToolTipText=Lista
+FileChooser.newFolderActionLabel.textAndMnemonic=Ny mapp
+FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
 FileChooser.listViewButtonAccessibleName=Lista
-FileChooser.listViewActionLabelText=Lista
-FileChooser.detailsViewButtonToolTipText=Detaljer
+FileChooser.listViewActionLabel.textAndMnemonic=Lista
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detaljer
 FileChooser.detailsViewButtonAccessibleName=Detaljer
-FileChooser.detailsViewActionLabelText=Detaljer
-FileChooser.refreshActionLabelText=F\u00F6rnya
-FileChooser.viewMenuLabelText=Vy
-FileChooser.fileNameHeaderText=Namn
-FileChooser.fileSizeHeaderText=Storlek
-FileChooser.fileTypeHeaderText=Typ
-FileChooser.fileDateHeaderText=\u00C4ndrad
-FileChooser.fileAttrHeaderText=Attribut
+FileChooser.detailsViewActionLabel.textAndMnemonic=Detaljer
+FileChooser.refreshActionLabel.textAndMnemonic=F\u00F6rnya
+FileChooser.viewMenuLabel.textAndMnemonic=Vy
+FileChooser.fileNameHeader.textAndMnemonic=Namn
+FileChooser.fileSizeHeader.textAndMnemonic=Storlek
+FileChooser.fileTypeHeader.textAndMnemonic=Typ
+FileChooser.fileDateHeader.textAndMnemonic=\u00C4ndrad
+FileChooser.fileAttrHeader.textAndMnemonic=Attribut

src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties

@@ -18,32 +18,28 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=\u67E5\u770B: 
-FileChooser.lookInLabelMnemonic=73
-FileChooser.saveInLabelText=\u4FDD\u5B58: 
-FileChooser.fileNameLabelText=\u6587\u4EF6\u540D: 
-FileChooser.fileNameLabelMnemonic=78
-FileChooser.folderNameLabelText=\u6587\u4EF6\u5939\u540D: 
-FileChooser.folderNameLabelMnemonic=78
-FileChooser.filesOfTypeLabelText=\u6587\u4EF6\u7C7B\u578B: 
-FileChooser.filesOfTypeLabelMnemonic=84
-FileChooser.upFolderToolTipText=\u5411\u4E0A\u4E00\u7EA7
+FileChooser.lookInLabel.textAndMnemonic=\u67E5\u770B(&I):
+FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58:
+FileChooser.fileNameLabel.textAndMnemonic=\u6587\u4EF6\u540D(&N):
+FileChooser.folderNameLabel.textAndMnemonic=\u6587\u4EF6\u5939\u540D(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=\u6587\u4EF6\u7C7B\u578B(&T):
+FileChooser.upFolderToolTip.textAndMnemonic=\u5411\u4E0A\u4E00\u7EA7
 FileChooser.upFolderAccessibleName=\u5411\u4E0A
-FileChooser.homeFolderToolTipText=\u4E3B\u76EE\u5F55
+FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u5F55
 FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u5F55
-FileChooser.newFolderToolTipText=\u521B\u5EFA\u65B0\u6587\u4EF6\u5939
+FileChooser.newFolderToolTip.textAndMnemonic=\u521B\u5EFA\u65B0\u6587\u4EF6\u5939
 FileChooser.newFolderAccessibleName=\u65B0\u5EFA\u6587\u4EF6\u5939
-FileChooser.newFolderActionLabelText=\u65B0\u5EFA\u6587\u4EF6\u5939
-FileChooser.listViewButtonToolTipText=\u5217\u8868
+FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u5EFA\u6587\u4EF6\u5939
+FileChooser.listViewButtonToolTip.textAndMnemonic=\u5217\u8868
 FileChooser.listViewButtonAccessibleName=\u5217\u8868
-FileChooser.listViewActionLabelText=\u5217\u8868
-FileChooser.detailsViewButtonToolTipText=\u8BE6\u7EC6\u8D44\u6599
+FileChooser.listViewActionLabel.textAndMnemonic=\u5217\u8868
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8BE6\u7EC6\u8D44\u6599
 FileChooser.detailsViewButtonAccessibleName=\u8BE6\u7EC6\u8D44\u6599
-FileChooser.detailsViewActionLabelText=\u8BE6\u7EC6\u8D44\u6599
-FileChooser.refreshActionLabelText=\u5237\u65B0
-FileChooser.viewMenuLabelText=\u89C6\u56FE
-FileChooser.fileNameHeaderText=\u540D\u79F0
-FileChooser.fileSizeHeaderText=\u5927\u5C0F
-FileChooser.fileTypeHeaderText=\u7C7B\u578B
-FileChooser.fileDateHeaderText=\u4FEE\u6539\u65E5\u671F
-FileChooser.fileAttrHeaderText=\u5C5E\u6027
+FileChooser.detailsViewActionLabel.textAndMnemonic=\u8BE6\u7EC6\u8D44\u6599
+FileChooser.refreshActionLabel.textAndMnemonic=\u5237\u65B0
+FileChooser.viewMenuLabel.textAndMnemonic=\u89C6\u56FE
+FileChooser.fileNameHeader.textAndMnemonic=\u540D\u79F0
+FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F
+FileChooser.fileTypeHeader.textAndMnemonic=\u7C7B\u578B
+FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
+FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027

src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties

@@ -18,32 +18,28 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabelText=\u67E5\u8A62:
-FileChooser.lookInLabelMnemonic=73
-FileChooser.saveInLabelText=\u5132\u5B58\u65BC: 
-FileChooser.fileNameLabelText=\u6A94\u6848\u540D\u7A31:
-FileChooser.fileNameLabelMnemonic=78
-FileChooser.folderNameLabelText=\u8CC7\u6599\u593E\u540D\u7A31:
-FileChooser.folderNameLabelMnemonic=78
-FileChooser.filesOfTypeLabelText=\u6A94\u6848\u985E\u578B:
-FileChooser.filesOfTypeLabelMnemonic=84
-FileChooser.upFolderToolTipText=\u5F80\u4E0A\u4E00\u5C64
+FileChooser.lookInLabel.textAndMnemonic=\u67E5\u8A62(&I):
+FileChooser.saveInLabel.textAndMnemonic=\u5132\u5B58\u65BC:
+FileChooser.fileNameLabel.textAndMnemonic=\u6A94\u6848\u540D\u7A31(&N):
+FileChooser.folderNameLabel.textAndMnemonic=\u8CC7\u6599\u593E\u540D\u7A31(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=\u6A94\u6848\u985E\u578B(&T):
+FileChooser.upFolderToolTip.textAndMnemonic=\u5F80\u4E0A\u4E00\u5C64
 FileChooser.upFolderAccessibleName=\u5F80\u4E0A
-FileChooser.homeFolderToolTipText=\u4E3B\u76EE\u9304
+FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u9304
 FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u9304
-FileChooser.newFolderToolTipText=\u5EFA\u7ACB\u65B0\u8CC7\u6599\u593E
+FileChooser.newFolderToolTip.textAndMnemonic=\u5EFA\u7ACB\u65B0\u8CC7\u6599\u593E
 FileChooser.newFolderAccessibleName=\u65B0\u8CC7\u6599\u593E
-FileChooser.newFolderActionLabelText=\u65B0\u8CC7\u6599\u593E
-FileChooser.listViewButtonToolTipText=\u6E05\u55AE
+FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u8CC7\u6599\u593E
+FileChooser.listViewButtonToolTip.textAndMnemonic=\u6E05\u55AE
 FileChooser.listViewButtonAccessibleName=\u6E05\u55AE
-FileChooser.listViewActionLabelText=\u6E05\u55AE
-FileChooser.detailsViewButtonToolTipText=\u8A73\u7D30\u8CC7\u8A0A
+FileChooser.listViewActionLabel.textAndMnemonic=\u6E05\u55AE
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A
 FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30\u8CC7\u8A0A
-FileChooser.detailsViewActionLabelText=\u8A73\u7D30\u8CC7\u8A0A
-FileChooser.refreshActionLabelText=\u91CD\u65B0\u6574\u7406
-FileChooser.viewMenuLabelText=\u6AA2\u8996
-FileChooser.fileNameHeaderText=\u540D\u7A31
-FileChooser.fileSizeHeaderText=\u5927\u5C0F
-FileChooser.fileTypeHeaderText=\u985E\u578B
-FileChooser.fileDateHeaderText=\u4FEE\u6539\u65E5\u671F
-FileChooser.fileAttrHeaderText=\u5C6C\u6027
+FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A
+FileChooser.refreshActionLabel.textAndMnemonic=\u91CD\u65B0\u6574\u7406
+FileChooser.viewMenuLabel.textAndMnemonic=\u6AA2\u8996
+FileChooser.fileNameHeader.textAndMnemonic=\u540D\u7A31
+FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F
+FileChooser.fileTypeHeader.textAndMnemonic=\u985E\u578B
+FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
+FileChooser.fileAttrHeader.textAndMnemonic=\u5C6C\u6027

src/share/classes/javax/swing/JPopupMenu.java

@@ -359,17 +359,20 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
         int scrBottomY = scrBounds.y + scrHeight;
 
         // Ensure that popup menu fits the screen
-        if (popupRightX > (long)scrRightX) {
+        if (popupRightX > (long) scrRightX) {
             popupLocation.x = scrRightX - popupSize.width;
-            if( popupLocation.x < scrBounds.x ) {
-                popupLocation.x = scrBounds.x ;
         }
-        }
-        if (popupBottomY > (long)scrBottomY) {
+
+        if (popupBottomY > (long) scrBottomY) {
             popupLocation.y = scrBottomY - popupSize.height;
-            if( popupLocation.y < scrBounds.y ) {
-                popupLocation.y = scrBounds.y;
         }
+
+        if (popupLocation.x < scrBounds.x) {
+            popupLocation.x = scrBounds.x;
+        }
+
+        if (popupLocation.y < scrBounds.y) {
+            popupLocation.y = scrBounds.y;
         }
 
         return popupLocation;

src/share/classes/javax/swing/UIDefaults.java

@@ -297,7 +297,7 @@ public class UIDefaults extends Hashtable<Object,Object>
         Map<String, Object> values = resourceCache.get(l);
 
         if (values == null) {
-            values = new HashMap<String, Object>();
+            values = new TextAndMnemonicHashMap();
             for (int i=resourceBundles.size()-1; i >= 0; i--) {
                 String bundleName = resourceBundles.get(i);
                 try {
@@ -1215,4 +1215,120 @@ public class UIDefaults extends Hashtable<Object,Object>
             return null;
         }
     }
+
+    /**
+     * <code>TextAndMnemonicHashMap</code> stores swing resource strings. Many of strings
+     * can have a mnemonic. For example:
+     *   FileChooser.saveButton.textAndMnemonic=&Save
+     * For this case method get returns "Save" for the key "FileChooser.saveButtonText" and
+     * mnemonic "S" for the key "FileChooser.saveButtonMnemonic"
+     *
+     * There are several patterns for the text and mnemonic suffixes which are checked by the
+     * <code>TextAndMnemonicHashMap</code> class.
+     * Patterns which are converted to the xxx.textAndMnemonic key:
+     * (xxxNameText, xxxNameMnemonic)
+     * (xxxNameText, xxxMnemonic)
+     * (xxx.nameText, xxx.mnemonic)
+     * (xxxText, xxxMnemonic)
+     *
+     * These patterns can have a mnemonic index in format
+     * (xxxDisplayedMnemonicIndex)
+     *
+     * Pattern which is converted to the xxx.titleAndMnemonic key:
+     * (xxxTitle, xxxMnemonic)
+     *
+     */
+    private static class TextAndMnemonicHashMap extends HashMap<String, Object> {
+
+        static final String AND_MNEMONIC = "AndMnemonic";
+        static final String TITLE_SUFFIX = ".titleAndMnemonic";
+        static final String TEXT_SUFFIX = ".textAndMnemonic";
+
+        @Override
+        public Object get(Object key) {
+
+            Object value = super.get(key);
+
+            if (value == null) {
+
+                boolean checkTitle = false;
+
+                String stringKey = key.toString();
+                String compositeKey = null;
+
+                if (stringKey.endsWith(AND_MNEMONIC)) {
+                    return null;
+                }
+
+                if (stringKey.endsWith(".mnemonic")) {
+                    compositeKey = composeKey(stringKey, 9, TEXT_SUFFIX);
+                } else if (stringKey.endsWith("NameMnemonic")) {
+                    compositeKey = composeKey(stringKey, 12, TEXT_SUFFIX);
+                } else if (stringKey.endsWith("Mnemonic")) {
+                    compositeKey = composeKey(stringKey, 8, TEXT_SUFFIX);
+                    checkTitle = true;
+                }
+
+                if (compositeKey != null) {
+                    value = super.get(compositeKey);
+                    if (value == null && checkTitle) {
+                        compositeKey = composeKey(stringKey, 8, TITLE_SUFFIX);
+                        value = super.get(compositeKey);
+                    }
+
+                    return value == null ? null : getMnemonicFromProperty(value.toString());
+                }
+
+                if (stringKey.endsWith("NameText")) {
+                    compositeKey = composeKey(stringKey, 8, TEXT_SUFFIX);
+                } else if (stringKey.endsWith(".nameText")) {
+                    compositeKey = composeKey(stringKey, 9, TEXT_SUFFIX);
+                } else if (stringKey.endsWith("Text")) {
+                    compositeKey = composeKey(stringKey, 4, TEXT_SUFFIX);
+                } else if (stringKey.endsWith("Title")) {
+                    compositeKey = composeKey(stringKey, 5, TITLE_SUFFIX);
+                }
+
+                if (compositeKey != null) {
+                    value = super.get(compositeKey);
+                    return value == null ? null : getTextFromProperty(value.toString());
+                }
+
+                if (stringKey.endsWith("DisplayedMnemonicIndex")) {
+                    compositeKey = composeKey(stringKey, 22, TEXT_SUFFIX);
+                    value = super.get(compositeKey);
+                    if (value == null) {
+                        compositeKey = composeKey(stringKey, 22, TITLE_SUFFIX);
+                        value = super.get(compositeKey);
+                    }
+                    return value == null ? null : getIndexFromProperty(value.toString());
+                }
+            }
+
+            return value;
+        }
+
+        String composeKey(String key, int reduce, String sufix) {
+            return key.substring(0, key.length() - reduce) + sufix;
+        }
+
+        String getTextFromProperty(String text) {
+            return text.replace("&", "");
+        }
+
+        String getMnemonicFromProperty(String text) {
+            int index = text.indexOf('&');
+            if (0 <= index && index < text.length() - 1) {
+                char c = text.charAt(index + 1);
+                return Integer.toString((int) Character.toUpperCase(c));
+            }
+            return null;
+        }
+
+        String getIndexFromProperty(String text) {
+            int index = text.indexOf('&');
+            return (index == -1) ? null : Integer.toString(index);
+        }
+    }
+
 }

src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java

@@ -875,6 +875,8 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants {
                 int availTextWidth = tabScroller.croppedEdge.getCropline() -
                         (textRect.x - tabRect.x) - tabScroller.croppedEdge.getCroppedSideWidth();
                 clippedTitle = SwingUtilities2.clipStringIfNecessary(null, metrics, title, availTextWidth);
+            } else if (!scrollableTabLayoutEnabled() && isHorizontalTabPlacement()) {
+                clippedTitle = SwingUtilities2.clipStringIfNecessary(null, metrics, title, textRect.width);
             }
 
             paintText(g, tabPlacement, font, metrics,

src/solaris/classes/sun/awt/X11/XTextAreaPeer.java

@@ -168,6 +168,8 @@ class XTextAreaPeer extends XComponentPeer implements TextAreaPeer {
 
     public void dispose() {
         XToolkit.specialPeerMap.remove(jtext);
+        // visible caret has a timer thread which must be stopped
+        jtext.getCaret().setVisible(false);
         jtext.removeNotify();
         textPane.removeNotify();
         super.dispose();

src/solaris/classes/sun/awt/X11/XTextFieldPeer.java

@@ -104,6 +104,8 @@ public class XTextFieldPeer extends XComponentPeer implements TextFieldPeer {
 
     public void dispose() {
         XToolkit.specialPeerMap.remove(xtext);
+        // visible caret has a timer thread which must be stopped
+        xtext.getCaret().setVisible(false);
         xtext.removeNotify();
         super.dispose();
     }

test/java/awt/Frame/InvisibleOwner/InvisibleOwner.java

+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ *
+ * 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.
+ */
+
+/*
+  @test
+  @bug 7154177
+  @summary An invisible owner frame should never become visible
+  @author anthony.petrov@oracle.com: area=awt.toplevel
+  @library ../../regtesthelpers
+  @build Util
+  @run main InvisibleOwner
+*/
+
+import java.awt.*;
+import java.awt.event.*;
+import java.util.*;
+import test.java.awt.regtesthelpers.Util;
+
+public class InvisibleOwner {
+    private static volatile boolean invisibleOwnerClicked = false;
+    private static volatile boolean backgroundClicked = false;
+
+    private static final int F_X = 40, F_Y = 40, F_W = 200, F_H = 200;
+
+    public static void main(String[] args) throws AWTException {
+        // A background frame to compare a pixel color against
+        Frame helperFrame = new Frame("Background frame");
+        helperFrame.setBackground(Color.BLUE);
+        helperFrame.setBounds(F_X - 10, F_Y - 10, F_W + 20, F_H + 20);
+        helperFrame.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent ev) {
+                backgroundClicked= true;
+            }
+        });
+        helperFrame.setVisible(true);
+
+        // An owner frame that should stay invisible
+        Frame frame = new Frame("Invisible Frame");
+        frame.setBackground(Color.GREEN);
+        frame.setLocation(F_X, F_Y);
+        frame.setSize(F_W, F_H);
+        frame.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent ev) {
+                invisibleOwnerClicked = true;
+            }
+        });
+
+        // An owned window
+        final Window window = new Window(frame);
+        window.setBackground(Color.RED);
+        window.setSize(200, 200);
+        window.setLocation(300, 300);
+        window.setVisible(true);
+        try { Thread.sleep(1000); } catch (Exception ex) {}
+
+        Robot robot = new Robot();
+
+        // Clicking the owned window shouldn't make its owner visible
+        Util.clickOnComp(window, robot);
+        try { Thread.sleep(500); } catch (Exception ex) {}
+
+
+        // Assume the location and size are applied to the frame as expected.
+        // This should work fine on the Mac. We can't call getLocationOnScreen()
+        // since from Java perspective the frame is invisible anyway.
+
+        // 1. Check the color at the center of the owner frame
+        Color c = robot.getPixelColor(F_X + F_W / 2, F_Y + F_H / 2);
+        System.err.println("Pixel color: " + c);
+        if (c == null) {
+            throw new RuntimeException("Robot.getPixelColor() failed");
+        }
+        if (c.equals(frame.getBackground())) {
+            throw new RuntimeException("The invisible frame has become visible");
+        }
+        if (!c.equals(helperFrame.getBackground())) {
+            throw new RuntimeException("The background helper frame has been covered by something unexpected");
+        }
+
+        // 2. Try to click it
+        robot.mouseMove(F_X + F_W / 2, F_Y + F_H / 2);
+        robot.mousePress(InputEvent.BUTTON1_MASK);
+        robot.mouseRelease(InputEvent.BUTTON1_MASK);
+        try { Thread.sleep(500); } catch (Exception ex) {}
+
+        // Cleanup
+        window.dispose();
+        frame.dispose();
+        helperFrame.dispose();
+
+        // Final checks
+        if (invisibleOwnerClicked) {
+            throw new RuntimeException("An invisible owner frame got clicked. Looks like it became visible.");
+        }
+        if (!backgroundClicked) {
+            throw new RuntimeException("The background helper frame hasn't been clciked");
+        }
+    }
+}

test/java/awt/TextArea/DisposeTest/TestDispose.java

+/*
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ *
+ * 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.
+ */
+
+/*
+ * Portions Copyright (c) 2012 IBM Corporation
+ */
+
+/* @test
+ * @bug 7155298
+ * @run main/othervm/timeout=60 TestDispose
+ * @summary Editable TextArea blocks GUI application from exit.
+ * @author Sean Chou
+ */
+
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.TextArea;
+import java.awt.Toolkit;
+import java.lang.reflect.InvocationTargetException;
+
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+
+import sun.awt.SunToolkit;
+
+public class TestDispose {
+
+    public static Frame frame = null;
+    public static TextArea textArea = null;
+    public static volatile Process worker = null;
+
+    public void testDispose() throws InvocationTargetException,
+            InterruptedException {
+        SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+
+        SwingUtilities.invokeAndWait(new Runnable() {
+            @Override
+            public void run() {
+                frame = new JFrame("Test");
+
+                textArea = new TextArea("editable textArea");
+                textArea.setEditable(true);
+                // textArea.setEditable(false); // this testcase passes if textArea is non-editable
+
+                frame.setLayout(new FlowLayout());
+                frame.add(textArea);
+
+                frame.pack();
+                frame.setVisible(true);
+            }
+        });
+        toolkit.realSync();
+
+        SwingUtilities.invokeAndWait(new Runnable() {
+            @Override
+            public void run() {
+                frame.dispose();
+            }
+        });
+        toolkit.realSync();
+    }
+
+    public static void main(String[] args) throws Exception{
+        if(args.length == 0) {
+            Runtime.getRuntime().addShutdownHook(new Thread(){
+                public void run() {
+                    worker.destroy();
+                }
+            });
+
+            System.out.println(System.getProperty("java.home")+"/bin/java TestDispose workprocess");
+            worker = Runtime.getRuntime().exec(System.getProperty("java.home")+"/bin/java TestDispose workprocess");
+            worker.waitFor();
+            return;
+        }
+
+        TestDispose app = new TestDispose();
+        app.testDispose();
+    }
+
+}

test/java/awt/TextField/DisposeTest/TestDispose.java

+/*
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ *
+ * 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.
+ */
+
+/*
+ * Portions Copyright (c) 2012 IBM Corporation
+ */
+
+/* @test
+ * @bug 7155298
+ * @run main/othervm/timeout=60 TestDispose
+ * @summary Editable TextField blocks GUI application from exit.
+ * @author Sean Chou
+ */
+
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.TextField;
+import java.awt.Toolkit;
+import java.lang.reflect.InvocationTargetException;
+
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+
+import sun.awt.SunToolkit;
+
+public class TestDispose {
+
+    public static Frame frame = null;
+    public static TextField textField = null;
+    public static volatile Process worker = null;
+
+    public void testDispose() throws InvocationTargetException,
+            InterruptedException {
+        SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+
+        SwingUtilities.invokeAndWait(new Runnable() {
+            @Override
+            public void run() {
+                frame = new JFrame("Test");
+
+                textField = new TextField("editable textArea");
+                textField.setEditable(true);
+                // textField.setEditable(false); // this testcase passes if textField is non-editable
+
+                frame.setLayout(new FlowLayout());
+                frame.add(textField);
+
+                frame.pack();
+                frame.setVisible(true);
+            }
+        });
+        toolkit.realSync();
+
+        SwingUtilities.invokeAndWait(new Runnable() {
+            @Override
+            public void run() {
+                frame.dispose();
+            }
+        });
+        toolkit.realSync();
+
+    }
+
+    public static void main(String[] args) throws Exception{
+        if(args.length == 0) {
+            Runtime.getRuntime().addShutdownHook(new Thread(){
+                public void run() {
+                    worker.destroy();
+                }
+            });
+
+            System.out.println(System.getProperty("java.home")+"/bin/java TestDispose workprocess");
+            worker = Runtime.getRuntime().exec(System.getProperty("java.home")+"/bin/java TestDispose workprocess");
+            worker.waitFor();
+            return;
+        }
+
+        TestDispose app = new TestDispose();
+        app.testDispose();
+    }
+
+}

test/javax/swing/JTabbedPane/4310381/bug4310381.html

+<html>
+<body>
+<applet  code="bug4310381.class" width=150 height=150></applet>
+Observe that long Tab titles are clipped with dots at the end
+</body>
+</html> 

test/javax/swing/JTabbedPane/4310381/bug4310381.java

+/*
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ *
+ * 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.
+ */
+
+/*
+ * Portions Copyright (c) 2012 IBM Corporation
+ */
+
+/*
+ * @test
+ * @bug 4310381
+ * @summary Text in multi-row/col JTabbedPane tabs can be truncated/clipped
+ * @author Charles Lee
+   @run applet/manual=yesno bug4310381.html
+ */
+
+
+import javax.swing.*;
+import java.awt.*;
+import java.lang.reflect.InvocationTargetException;
+
+public class bug4310381 extends JApplet {
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                JFrame frame = new JFrame();
+
+                frame.setContentPane(createContentPane());
+                frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+                frame.setSize(150, 200);
+                frame.setLocationRelativeTo(null);
+
+                frame.setVisible(true);
+
+            }
+        });
+    }
+
+    @Override
+    public void init() {
+        try {
+            SwingUtilities.invokeAndWait(new Runnable() {
+                @Override
+                public void run() {
+                    setContentPane(createContentPane());
+                }
+            });
+        } catch (InterruptedException | InvocationTargetException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static Container createContentPane() {
+        JTabbedPane tab = new JTabbedPane();
+        String a2z = "abcdefghijklmnopqrstuvwxyz";
+
+        tab.addTab("0" + a2z + a2z, new JLabel("0"));
+        tab.addTab("1" + a2z, new JLabel("1" + a2z));
+        tab.addTab("2" + a2z, new JLabel("2" + a2z));
+        tab.addTab("3", new JLabel("3" + a2z)); // The last tab in Metal isn't truncated, that's ok
+
+        return tab;
+    }
+}