Index: trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java	(revision 692)
+++ trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java	(revision 693)
@@ -20,9 +20,12 @@
 	}
 	
-	protected static JFileChooser createAndOpenFileChooser(boolean open, boolean multiple) {
+	protected static JFileChooser createAndOpenFileChooser(boolean open, boolean multiple, String title) {
 		String curDir = Main.pref.get("lastDirectory");
 		if (curDir.equals(""))
 			curDir = ".";
 		JFileChooser fc = new JFileChooser(new File(curDir));
+		if(title != null)
+			fc.setDialogTitle(title);
+
 		fc.setMultiSelectionEnabled(multiple);
 		for (int i = 0; i < ExtensionFileFilter.filters.length; ++i)
Index: trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java	(revision 692)
+++ trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java	(revision 693)
@@ -55,5 +55,5 @@
 		}
 
-		JFileChooser fc = createAndOpenFileChooser(false, false);
+		JFileChooser fc = createAndOpenFileChooser(false, false, null);
 		if (fc == null)
 			return;
Index: trunk/src/org/openstreetmap/josm/actions/HelpAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/HelpAction.java	(revision 692)
+++ trunk/src/org/openstreetmap/josm/actions/HelpAction.java	(revision 693)
@@ -46,5 +46,5 @@
     }
 
-	private JFrame helpBrowser = new JFrame("JOSM Online Help");
+	private JFrame helpBrowser = new JFrame(tr("JOSM Online Help"));
 	private String baseurl = Main.pref.get("help.baseurl", "http://josm.openstreetmap.de");
 	private JEditorPane help = new JEditorPane();
@@ -82,7 +82,7 @@
 		JPanel buttons = new JPanel();
 		p.add(buttons, BorderLayout.SOUTH);
-		createButton(buttons, "Open in Browser");
-		createButton(buttons, "Edit");
-		createButton(buttons, "Reload");
+		createButton(buttons, tr("Open in Browser"));
+		createButton(buttons, tr("Edit"));
+		createButton(buttons, tr("Reload"));
 
 		helpBrowser.addWindowListener(new WindowAdapter(){
@@ -101,7 +101,7 @@
 
 	public void actionPerformed(ActionEvent e) {
-		if ("Open in Browser".equals(e.getActionCommand())) {
+		if (tr("Open in Browser").equals(e.getActionCommand())) {
 			OpenBrowser.displayUrl(url);
-		} else if ("Edit".equals(e.getActionCommand())) {
+		} else if (tr("Edit").equals(e.getActionCommand())) {
 			if (!url.startsWith(baseurl)) {
 				JOptionPane.showMessageDialog(Main.parent, tr("Can only edit help pages from JOSM Online Help"));
@@ -109,5 +109,5 @@
 			}
 			OpenBrowser.displayUrl(url+"?action=edit");
-		} else if ("Reload".equals(e.getActionCommand())) {
+		} else if (tr("Reload").equals(e.getActionCommand())) {
 			setHelpUrl(url);
 		} else if (e.getActionCommand() == null) {
@@ -166,5 +166,5 @@
 			help.read(new StringReader(reader.read(url)), help.getEditorKit().createDefaultDocument());
         } catch (IOException e) {
-        	help.setText("Error while loading page "+url);
+        	help.setText(tr("Error while loading page {0}",url));
         }
 		helpBrowser.setVisible(true);
Index: trunk/src/org/openstreetmap/josm/actions/OpenAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/OpenAction.java	(revision 692)
+++ trunk/src/org/openstreetmap/josm/actions/OpenAction.java	(revision 693)
@@ -41,5 +41,5 @@
 
 	public void actionPerformed(ActionEvent e) {
-		JFileChooser fc = createAndOpenFileChooser(true, true);
+		JFileChooser fc = createAndOpenFileChooser(true, true, null);
 		if (fc == null)
 			return;
Index: trunk/src/org/openstreetmap/josm/actions/SaveAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SaveAction.java	(revision 692)
+++ trunk/src/org/openstreetmap/josm/actions/SaveAction.java	(revision 693)
@@ -40,5 +40,5 @@
 			}
 		}
-		return openFileDialog();
+		return openFileDialog(layer);
 	}
 }
Index: trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java	(revision 692)
+++ trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java	(revision 693)
@@ -87,6 +87,6 @@
 	}
 
-	public static File openFileDialog() {
-		JFileChooser fc = createAndOpenFileChooser(false, false);
+	public static File openFileDialog(Layer layer) {
+		JFileChooser fc = createAndOpenFileChooser(false, false, layer instanceof GpxLayer ? tr("Save GPX file") : tr("Save OSM file"));
 		if (fc == null)
 			return null;
@@ -99,4 +99,6 @@
 			if (ff instanceof ExtensionFileFilter)
 				fn += "." + ((ExtensionFileFilter)ff).defaultExtension;
+			else if (layer instanceof GpxLayer)
+				fn += ".gpx";
 			else
 				fn += ".osm";
Index: trunk/src/org/openstreetmap/josm/actions/SaveAsAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SaveAsAction.java	(revision 692)
+++ trunk/src/org/openstreetmap/josm/actions/SaveAsAction.java	(revision 693)
@@ -26,5 +26,5 @@
 	
 	@Override protected File getFile(Layer layer) {
-		return openFileDialog();
+		return openFileDialog(layer);
 	}
 }