Changeset 104 in josm for src/org/openstreetmap/josm/command/ConflictResolveCommand.java

Timestamp:

2006-07-03T00:31:24+02:00 (20 years ago)

Author:

imi

Message:

• started i18n
• started "download incomplete ways" action
• added straight line selection mode

File:

• src/org/openstreetmap/josm/command/ConflictResolveCommand.java (modified) (2 diffs)

src/org/openstreetmap/josm/command/ConflictResolveCommand.java

@@ -1 +1 @@
 package org.openstreetmap.josm.command;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.util.Collection;
@@ -73 +75 @@
                         if (c.resolution != null)
                                 i++;
-                return new DefaultMutableTreeNode(new JLabel("Resolve "+i+" conflicts in "+resolved.size()+" objects", ImageProvider.get("data", "primitive"), JLabel.HORIZONTAL));
+                return new DefaultMutableTreeNode(new JLabel(tr("Resolve {0} conflicts in {1} objects",i,resolved.size()), ImageProvider.get("data", "primitive"), JLabel.HORIZONTAL));
     }
 }