Index: /trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java	(revision 1647)
+++ /trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java	(revision 1648)
@@ -46,8 +46,8 @@
             File file = fc.getSelectedFile();
             if (file == null || (file.exists() && 1 !=
-                new ExtendedDialog(Main.parent, 
-                        tr("Overwrite"), 
+                new ExtendedDialog(Main.parent,
+                        tr("Overwrite"),
                         tr("File exists. Overwrite?"),
-                        new String[] {tr("Overwrite"), tr("Cancel")}, 
+                        new String[] {tr("Overwrite"), tr("Cancel")},
                         new String[] {"save_as.png", "cancel.png"}).getValue()))
                 return null;
Index: /trunk/src/org/openstreetmap/josm/actions/SaveAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/SaveAction.java	(revision 1647)
+++ /trunk/src/org/openstreetmap/josm/actions/SaveAction.java	(revision 1648)
@@ -7,5 +7,8 @@
 import java.io.File;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.GpxLayer;
+import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -28,4 +31,10 @@
     @Override public File getFile(Layer layer) {
         File f = layer.getAssociatedFile();
+        if(f != null && layer instanceof GpxLayer && f.exists() && 1 !=
+        new ExtendedDialog(Main.parent, tr("Overwrite"),
+        tr("File {0} exists. Overwrite?", f.getName()),
+        new String[] {tr("Overwrite"), tr("Cancel")},
+        new String[] {"save_as.png", "cancel.png"}).getValue())
+            f = null;
         return f == null ? openFileDialog(layer) : f;
     }
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java	(revision 1647)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java	(revision 1648)
@@ -70,5 +70,5 @@
     private void configureSites() {
         JPanel p = new JPanel(new GridBagLayout());
-        p.add(new JLabel(tr("Add either site-josm.xml or Wiki Pages.")), GBC.eol());
+        p.add(new JLabel(tr("Add JOSM Plugin description URL.")), GBC.eol());
         final DefaultListModel model = new DefaultListModel();
         for (String s : PluginDownloader.getSites())
@@ -79,5 +79,5 @@
         buttons.add(new JButton(new AbstractAction(tr("Add")){
             public void actionPerformed(ActionEvent e) {
-                String s = JOptionPane.showInputDialog(gui, tr("Add either site-josm.xml or Wiki Pages."));
+                String s = JOptionPane.showInputDialog(gui, tr("Add JOSM Plugin description URL."));
                 if (s != null)
                     model.addElement(s);
@@ -90,5 +90,5 @@
                     return;
                 }
-                String s = JOptionPane.showInputDialog(gui, tr("Add either site-josm.xml or Wiki Pages."), list.getSelectedValue());
+                String s = JOptionPane.showInputDialog(gui, tr("Edit JOSM Plugin description URL."), list.getSelectedValue());
                 model.setElementAt(s, list.getSelectedIndex());
             }