Index: trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 2718)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 2719)
@@ -474,8 +474,7 @@
                                 + "Really move them?", max));
                         ed.toggleEnable("movedManyElements");
-                        ed.setToggleCheckboxText(tr("Always move and don't show dialog again"));
                         ed.showDialog();
 
-                        if(ed.getValue() != 1 && ed.getValue() != ExtendedDialog.DialogNotShown)
+                        if(ed.getValue() != 1)
                         {
                             Main.main.undoRedo.undo();
Index: trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java	(revision 2718)
+++ trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java	(revision 2719)
@@ -197,5 +197,5 @@
 
         public MessagePanel(boolean donotshow, Object message) {
-            cbShowDialog = new JCheckBox(tr("Do not show again"));
+            cbShowDialog = new JCheckBox(tr("Do not show again (remembers choice)"));
             cbShowDialog.setSelected(donotshow);
             setLayout(new GridBagLayout());
Index: trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java	(revision 2718)
+++ trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java	(revision 2719)
@@ -37,5 +37,5 @@
     private String togglePref = "";
     private int toggleValue = -1;
-    private String toggleCheckboxText = tr("Do not show again");
+    private String toggleCheckboxText = tr("Do not show again (remembers choice)");
     private JCheckBox toggleCheckbox = null;
     private Component parent;
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 2718)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 2719)
@@ -582,5 +582,4 @@
                     ,toDelete.file.getName()), ImageProvider.get("dialogs/geoimage/deletefromdisk"),SwingConstants.LEFT))
                 .toggleEnable("geoimage.deleteimagefromdisk")
-                .setToggleCheckboxText(tr("Always delete and don't show this dialog again"))
                 .setCancelButton(1)
                 .setDefaultButton(2)
@@ -588,5 +587,5 @@
                 .getValue();
 
-            if(result == 2 || result == ExtendedDialog.DialogNotShown)
+            if(result == 2)
             {
                 data.remove(currentPhoto);
Index: trunk/src/org/openstreetmap/josm/io/FileImporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/FileImporter.java	(revision 2718)
+++ trunk/src/org/openstreetmap/josm/io/FileImporter.java	(revision 2719)
@@ -43,5 +43,5 @@
      */
     public void importData(List<File> files) throws IOException, IllegalDataException {
-        throw new IOException(tr("Could not import Files."));
+        throw new IOException(tr("Could not import files."));
     }