Changeset 280 in josm for src/org/openstreetmap

Timestamp:

2007-07-06T09:57:37+02:00 (17 years ago)

Author:

imi

Message:

• removed unused po/ subdirectory (look in osm.org's subversion for the keys.pot)
• fixed some strings for better translation.

File:

• src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) (7 diffs)

src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -2 +2 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.awt.event.ActionEvent;
@@ -30 +31 @@
 import org.openstreetmap.josm.data.osm.visitor.NameVisitor;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
+import org.openstreetmap.josm.tools.I18n;
 
 /**
@@ -155 +157 @@
                         }
                         if (wayOccurenceCounter.isEmpty()) {
-                                JOptionPane.showMessageDialog(Main.parent, tr("The selected node(s) is (are) not part of any way."));
+                                JOptionPane.showMessageDialog(Main.parent, 
+                                                trn("The selected node is not part of any way.",
+                                                                "The selected nodes are not part of any way.", selectedNodes.size()));
                                 return;
                         }
@@ -183 +187 @@
                         }
                         if (!nds.isEmpty()) {
-                                JOptionPane.showMessageDialog(Main.parent, tr("The selected way does not contain (all) the selected node(s)."));
+                                JOptionPane.showMessageDialog(Main.parent, 
+                                                trn("The selected way does not contain the selected node.",
+                                                                "The selected way does not contain all the selected nodes.", selectedNodes.size()));
                                 return;
                         }
@@ -201 +207 @@
                         }
                         if (wayOccurenceCounter.isEmpty()) {
-                                JOptionPane.showMessageDialog(Main.parent, tr("The selected segment(s) is (are) not part of any way."));
+                                JOptionPane.showMessageDialog(Main.parent, 
+                                                trn("The selected segment is not part of any way.",
+                                                                "The selected segments are not part of any way.", selectedSegments.size()));
                                 return;
                         }
@@ -208 +216 @@
                                 if (entry.getValue().equals(selectedSegments.size())) {
                                         if (selectedWay != null) {
-                                                JOptionPane.showMessageDialog(Main.parent, tr("There is more than one way using the segment(s) you selected. Please select the way also."));
+                                                JOptionPane.showMessageDialog(Main.parent,
+                                                                trn("There is more than one way using the segment you selected. Please select the way also.",
+                                                                                "There is more than one way using the segments you selected. Please select the way also.", selectedSegments.size()));
                                                 return;
                                         }
@@ -224 +234 @@
 
                         if (!selectedWay.segments.containsAll(selectedSegments)) {
-                                JOptionPane.showMessageDialog(Main.parent, tr("The selected way does not contain (all) the selected segment(s)."));
+                                JOptionPane.showMessageDialog(Main.parent, 
+                                                trn("The selected way does not contain the selected segment.",
+                                                                "The selected way does not contain all the selected segments.", selectedSegments.size()));
                                 return;
                         }