Index: applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/ForwardActionListener.java
===================================================================
--- applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/ForwardActionListener.java	(revision 13569)
+++ applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/ForwardActionListener.java	(revision 13569)
@@ -0,0 +1,30 @@
+// License: GPL. Copyright 2007 by Immanuel Scholz and others
+package org.openstreetmap.josm.plugins.taggingpresettester;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import org.openstreetmap.josm.gui.dialogs.PropertiesDialog;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset;
+
+/**
+ * Just an ActionListener that forwards calls to actionPerformed to some other
+ * listener doing some refresh stuff on the way.
+ * @author imi
+ */
+public final class ForwardActionListener implements ActionListener {
+    public final TaggingPreset preset;
+
+    private final PropertiesDialog propertiesDialog;
+
+    public ForwardActionListener(PropertiesDialog propertiesDialog, TaggingPreset preset) {
+        this.propertiesDialog = propertiesDialog;
+        this.preset = preset;
+    }
+
+    public void actionPerformed(ActionEvent e) {
+        this.propertiesDialog.taggingPresets.setSelectedIndex(0);
+        e.setSource(this);
+        preset.actionPerformed(e);
+    }
+}
Index: applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingCellRenderer.java
===================================================================
--- applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingCellRenderer.java	(revision 13569)
+++ applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingCellRenderer.java	(revision 13569)
@@ -0,0 +1,47 @@
+// License: GPL. Copyright 2007 by Immanuel Scholz and others
+package org.openstreetmap.josm.plugins.taggingpresettester;
+
+import java.awt.Component;
+import java.awt.Image;
+
+import javax.swing.Action;
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.ImageIcon;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JList;
+
+import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset;
+
+final public class TaggingCellRenderer extends DefaultListCellRenderer {
+    @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+        TaggingPreset a = null;
+        if (value instanceof ForwardActionListener)
+            a = ((ForwardActionListener)value).preset;
+        else if (value instanceof TaggingPreset)
+            a = (TaggingPreset)value;
+        String name = a == null ? null : (String)a.getValue(Action.NAME);
+        if (name == null)
+            return super.getListCellRendererComponent(list, "", index, false, false);
+        JComponent c = (JComponent)super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+        JLabel l = new JLabel(name);
+        l.setForeground(c.getForeground());
+        l.setBackground(c.getBackground());
+        l.setFont(c.getFont());
+        l.setBorder(c.getBorder());
+        ImageIcon icon = (ImageIcon)a.getValue(Action.SMALL_ICON);
+        if (icon != null)
+            l.setIcon(new ImageIcon(icon.getImage().getScaledInstance(16, 16, Image.SCALE_SMOOTH)));
+        else {
+            if (a.types == null)
+                l.setIcon(ImageProvider.get("data", "empty"));
+            else if (a.types.size() != 1)
+                l.setIcon(ImageProvider.get("data", "object"));
+            else
+                l.setIcon(ImageProvider.get("Mf_" + a.types.get(0)));
+        }
+        l.setOpaque(true);
+        return l;
+    }
+}
Index: applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java
===================================================================
--- applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java	(revision 13563)
+++ applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java	(revision 13569)
@@ -1,3 +1,5 @@
 package org.openstreetmap.josm.plugins.taggingpresettester;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.BorderLayout;
@@ -24,5 +26,4 @@
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.tagging.TaggingCellRenderer;
 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
 import org.xml.sax.SAXException;
@@ -47,8 +48,8 @@
             } catch (IOException e) {
                 e.printStackTrace();
-                JOptionPane.showMessageDialog(null, "Could not read tagging preset source: "+source);
+                JOptionPane.showMessageDialog(null, tr("Could not read tagging preset source: {0}",source));
             } catch (SAXException e) {
                 e.printStackTrace();
-                JOptionPane.showMessageDialog(null, "Error parsing "+source+": "+e.getMessage());
+                JOptionPane.showMessageDialog(null, tr("Error parsing {0}: {1}",source,e.getMessage()));
             }
 
@@ -77,5 +78,5 @@
 
     public TaggingPresetTester(String[] args) {
-        super("Tagging Preset Tester");
+        super(tr("Tagging Preset Tester"));
         this.args = args;
         taggingPresets = new JComboBox();
@@ -92,5 +93,5 @@
         reselect();
 
-        JButton b = new JButton("Reload");
+        JButton b = new JButton(tr("Reload"));
         b.addActionListener(new ActionListener(){
             public void actionPerformed(ActionEvent e) {