Index: trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java (revision 2195) +++ trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java (revision 2196) @@ -8,5 +8,4 @@ import java.awt.Font; import java.io.File; -import java.io.IOException; import javax.swing.JCheckBox; Index: trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 2195) +++ trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 2196) @@ -346,5 +346,5 @@ public void initForSaveAndExit() { - putValue(NAME, tr("Save and Exit")); + putValue(NAME, tr("Save/Upload and Exit")); putValue(SHORT_DESCRIPTION, tr("Exit JOSM with saving. Unsaved changes are uploaded and/or saved.")); putValue(SMALL_ICON, ImageProvider.get("exit")); @@ -352,5 +352,5 @@ public void initForSaveAndDelete() { - putValue(NAME, tr("Save and Delete")); + putValue(NAME, tr("Save/Upload and Delete")); putValue(SHORT_DESCRIPTION, tr("Save/Upload layers before deleting. Unsaved changes are not lost.")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete")); @@ -480,7 +480,7 @@ String msg = tr( "An upload and/or save operation of one layer with modifications
" - + "was cancelled or has been failed.", + + "was cancelled or has failed.", "Upload and/or save operations of {0} layers with modifications
" - + "were cancelled or have been failed.", + + "were cancelled or have failed.", numProblems, numProblems