Index: /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 1505)
+++ /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 1506)
@@ -33,5 +33,5 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.download.DownloadSelection;
-import org.openstreetmap.josm.gui.ExtendedDialog; 
+import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.tools.GBC;
@@ -150,11 +150,11 @@
                 } catch (Throwable e) {
                     e.printStackTrace();
-                    
-                    int result = new ExtendedDialog(Main.parent, 
-                        tr("Disable plugin"), 
+
+                    int result = new ExtendedDialog(Main.parent,
+                        tr("Disable plugin"),
                         tr("Could not load plugin {0}. Delete from preferences?", info.name),
-                        new String[] {tr("Disable plugin"), tr("Cancel")}, 
-                        new String[] {"dialogs/delete.png", "cancel.png"}).getValue();  
-                    
+                        new String[] {tr("Disable plugin"), tr("Keep plugin")},
+                        new String[] {"dialogs/delete.png", "cancel.png"}).getValue();
+
                     if(result == 1)
                     {
@@ -251,6 +251,6 @@
 
         if (plugin != null) {
-            int answer = new ExtendedDialog(Main.parent, 
-                tr("Disable plugin"), 
+            int answer = new ExtendedDialog(Main.parent,
+                tr("Disable plugin"),
                 tr("An unexpected exception occurred that may have come from the ''{0}'' plugin.", plugin.info.name)
                     + "\n"
@@ -262,6 +262,6 @@
                     + "\n"
                     + tr("Should the plugin be disabled?"),
-                new String[] {tr("Disable plugin"), tr("Cancel")}, 
-                new String[] {"dialogs/delete.png", "cancel.png"}).getValue();  
+                new String[] {tr("Disable plugin"), tr("Cancel")},
+                new String[] {"dialogs/delete.png", "cancel.png"}).getValue();
             if (answer == 1) {
                 LinkedList<String> plugins = new LinkedList<String>(Arrays.asList(Main.pref.get("plugins").split(",")));