Index: /applications/editors/josm/plugins/cadastre-fr/build.xml
===================================================================
--- /applications/editors/josm/plugins/cadastre-fr/build.xml	(revision 30702)
+++ /applications/editors/josm/plugins/cadastre-fr/build.xml	(revision 30703)
@@ -12,5 +12,5 @@
     <property name="plugin.class" value="cadastre_fr.CadastrePlugin"/>
     <property name="plugin.description" value="A special handler for the French land registry WMS server."/>
-    <property name="plugin.icon" value="images/preferences/cadastrewms.gif"/>
+    <property name="plugin.icon" value="images/preferences/cadastrewms.png"/>
     <property name="plugin.link" value="http://wiki.openstreetmap.org/wiki/FR:JOSM/Fr:Plugin/Cadastre"/>
     <property name="plugin.stage" value="60"/>
Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java
===================================================================
--- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java	(revision 30702)
+++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java	(revision 30703)
@@ -99,5 +99,5 @@
      */
     public CadastrePreferenceSetting() {
-        super("cadastrewms.gif", I18n.tr("French cadastre WMS"),
+        super("cadastrewms.png", I18n.tr("French cadastre WMS"),
             tr("A special handler of the French cadastre wms at www.cadastre.gouv.fr" + "<BR><BR>"
                 + "Please read the Terms and Conditions of Use here (in French): <br>"
Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java
===================================================================
--- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java	(revision 30702)
+++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java	(revision 30703)
@@ -22,6 +22,6 @@
 public class AutoCompletionListRenderer extends JLabel implements TableCellRenderer {
 
-    static public final String RES_OSM_ICON = "/resources/osm.gif";
-    static public final String RES_SELECTION_ICON = "/resources/selection.gif";
+    static public final String RES_OSM_ICON = "/resources/osm.png";
+    static public final String RES_SELECTION_ICON = "/resources/selection.png";
 
     /** the icon used to decorate items of priority
Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java
===================================================================
--- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java	(revision 30702)
+++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java	(revision 30703)
@@ -114,5 +114,5 @@
         JPanel pnl = new JPanel();
         pnl.setLayout(new FlowLayout(FlowLayout.LEFT));
-        btnApply = new JButton("Apply");
+        btnApply = new JButton(tr("Apply"));
         pnl.add(btnApply);
         btnApply.addActionListener(