Index: trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- trunk/src/org/openstreetmap/josm/Main.java	(revision 3432)
+++ trunk/src/org/openstreetmap/josm/Main.java	(revision 3433)
@@ -361,5 +361,5 @@
         UIManager.put("OptionPane.noIcon", UIManager.get("OptionPane.cancelIcon"));
 
-        I18n.fixJFileChooser();
+        I18n.translateJavaInternalMessages();
 
         // init default coordinate format
Index: trunk/src/org/openstreetmap/josm/tools/I18n.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/I18n.java	(revision 3432)
+++ trunk/src/org/openstreetmap/josm/tools/I18n.java	(revision 3433)
@@ -29,6 +29,6 @@
 
     /* Localization keys for file chooser (and color chooser). */
-    private static final String[] jFileChooserLocalizationKeys = new String[] {
-        /* windows laf */
+    private static final String[] javaInternalMessageKeys = new String[] {
+        /* JFileChooser windows laf */
         "FileChooser.detailsViewActionLabelText",
         "FileChooser.detailsViewButtonAccessibleName",
@@ -56,5 +56,5 @@
         "FileChooser.viewMenuLabelText",
 
-        /* gtk laf */
+        /* JFileChooser gtk laf */
         "FileChooser.acceptAllFileFilterText",
         "FileChooser.cancelButtonText",
@@ -78,5 +78,5 @@
         "FileChooser.saveDialogTitleText",
 
-        /* motif laf */
+        /* JFileChooser motif laf */
         //"FileChooser.cancelButtonText",
         //"FileChooser.cancelButtonToolTipText",
@@ -97,5 +97,5 @@
         "FileChooser.updateButtonToolTipText",
 
-        /* color chooser */
+        /* gtk color chooser */
         "GTKColorChooserPanel.blueText",
         "GTKColorChooserPanel.colorNameText",
@@ -105,5 +105,11 @@
         "GTKColorChooserPanel.redText",
         "GTKColorChooserPanel.saturationText",
-        "GTKColorChooserPanel.valueText"
+        "GTKColorChooserPanel.valueText",
+        
+        /* JOptionPane */
+        "OptionPane.okButtonText",
+        "OptionPane.yesButtonText",
+        "OptionPane.noButtonText",
+        "OptionPane.cancelButtonText"
     };
     private static HashMap<String, String> strings = null;
@@ -460,10 +466,10 @@
      * by Java, but not for others (e.g. ru, uk).
      */
-    public static void fixJFileChooser() {
+    public static void translateJavaInternalMessages() {
         Locale l = Locale.getDefault();
 
         JFileChooser.setDefaultLocale(l);
         JColorChooser.setDefaultLocale(l);
-        for (String key : jFileChooserLocalizationKeys) {
+        for (String key : javaInternalMessageKeys) {
             String us = UIManager.getString(key, Locale.US);
             String loc = UIManager.getString(key, l);