Changeset 18408 in osm for applications

Timestamp:

2009-11-01T14:48:03+01:00 (15 years ago)

Author:

stoecker

Message:

fixed i18n error I made in last checkin

Location:

applications/editors/josm/plugins

Files:

• cadastre-fr/src/cadastre_fr/CadastrePlugin.java (modified) (2 diffs)
• czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ConflictResolver.java (modified) (1 diff)
• czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/HouseEditor.java (modified) (1 diff)
• czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.java (modified) (1 diff)
• czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/SuburbEditor.java (modified) (1 diff)
• livegps/src/livegps/LiveGpsPlugin.java (modified) (2 diffs)
• piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java (modified) (2 diffs)
• routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java (modified) (2 diffs)
• walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java (modified) (2 diffs)
• wmsplugin/src/wmsplugin/WMSPlugin.java (modified) (2 diffs)

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java

@@ -2 +2 @@
 
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -133 +134 @@
 
         if (cadastreJMenu == null) {
-            cadastreJMenu = menu.addMenu(tr("Cadastre"), KeyEvent.VK_C, menu.defaultMenuPos, ht("/Plugin/CadastreFr"));
+            cadastreJMenu = menu.addMenu(marktr("Cadastre"), KeyEvent.VK_C, menu.defaultMenuPos, ht("/Plugin/CadastreFr"));
             JosmAction grab = new MenuActionGrab();
             JMenuItem menuGrab = new JMenuItem(grab);

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ConflictResolver.java

@@ -65 +65 @@
 
         // And finalize initializing the form.
-        setupDialog(mainPanel, new String[] {});
+        setContent(mainPanel);
+        setupDialog();
         // TODO: Why does it always crash if the modality is set in constructor?
         setModal(false);

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/HouseEditor.java

@@ -34 +34 @@
 
         // And finalize initializing the form.
-        setupDialog(mainPanel, new String[] {"ok.png", "cancel.png"});
+        setContent(mainPanel);
+        this.setButtonIcons(new String[] {"ok.png", "cancel.png"});
+        setupDialog();
     }
 

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.java

@@ -45 +45 @@
 
         // And finalize initializing the form.
-        setupDialog(mainPanel, new String[] {"ok.png", "cancel.png"});
+        setContent(mainPanel);
+        this.setButtonIcons(new String[] {"ok.png", "cancel.png"});
+        setupDialog();
     }
 

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/SuburbEditor.java

@@ -53 +53 @@
 
         // And finalize initializing the form.
-        setupDialog(mainPanel, new String[] {"ok.png", "cancel.png"});
+        setContent(mainPanel);
+        this.setButtonIcons(new String[] {"ok.png", "cancel.png"});
+        setupDialog();
     }
 

applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java

@@ -2 +2 @@
 
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -98 +99 @@
     {
         MainMenu menu = Main.main.menu;
-        lgpsmenu = menu.addMenu(tr("LiveGPS"), KeyEvent.VK_G, menu.defaultMenuPos, ht("/Plugin/LiveGPS"));
+        lgpsmenu = menu.addMenu(marktr("LiveGPS"), KeyEvent.VK_G, menu.defaultMenuPos, ht("/Plugin/LiveGPS"));
 
         JosmAction captureAction = new CaptureAction();

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java

@@ -22 +22 @@
 
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
-import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.marktr;
 
 import java.awt.event.KeyEvent;
@@ -60 +60 @@
         // Create menu entry
         if ( Main.main.menu != null ) {
-            m_menu = Main.main.menu.addMenu(tr("PicLayer") , KeyEvent.VK_I, Main.main.menu.defaultMenuPos, ht("/Plugin/PicLayer"));
+            m_menu = Main.main.menu.addMenu(marktr("PicLayer") , KeyEvent.VK_I, Main.main.menu.defaultMenuPos, ht("/Plugin/PicLayer"));
         }
 

applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java

@@ -29 +29 @@
 
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -74 +75 @@
     public RoutingMenu() {
         MainMenu mm = Main.main.menu;
-        menu = mm.addMenu(tr("Routing"), KeyEvent.VK_O, mm.defaultMenuPos, ht("/Plugin/Routing"));
+        menu = mm.addMenu(marktr("Routing"), KeyEvent.VK_O, mm.defaultMenuPos, ht("/Plugin/Routing"));
 
         startMI = new JMenuItem(tr("Add routing layer"));

applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java

@@ -2 +2 @@
 
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
-import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.marktr;
 
 import java.awt.event.KeyEvent;
@@ -26 +26 @@
     {
         MainMenu menu = Main.main.menu;
-        walkingPapersMenu = menu.addMenu(tr("Walking Papers"), KeyEvent.VK_K, menu.defaultMenuPos, ht("/Plugin/WalkingPapers"));
+        walkingPapersMenu = menu.addMenu(marktr("Walking Papers"), KeyEvent.VK_K, menu.defaultMenuPos, ht("/Plugin/WalkingPapers"));
         walkingPapersMenu.add(new JMenuItem(new WalkingPapersAddLayerAction()));
     }

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java

@@ -2 +2 @@
 
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -169 +170 @@
 
         if (wmsJMenu == null)
-            wmsJMenu = menu.addMenu(tr("WMS"), KeyEvent.VK_W, menu.defaultMenuPos, ht("/Plugin/WMS"));
+            wmsJMenu = menu.addMenu(marktr("WMS"), KeyEvent.VK_W, menu.defaultMenuPos, ht("/Plugin/WMS"));
         else
             wmsJMenu.removeAll();