Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 1458)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 1459)
@@ -4,4 +4,5 @@
 import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.awt.AWTEvent;
@@ -63,7 +64,7 @@
     final private Cursor cursorJoinNode;
     final private Cursor cursorJoinWay;
-    enum Cursors { crosshair, node, way } 
+    enum Cursors { crosshair, node, way }
     private Cursors currCursor = Cursors.crosshair;
-    
+
     private static Node lastUsedNode = null;
     private double PHI=Math.toRadians(90);
@@ -94,5 +95,5 @@
         Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
             Shortcut.registerShortcut("mapmode:drawfocus", tr("Mode: Draw Focus"), KeyEvent.VK_N, Shortcut.GROUP_EDIT).getKeyStroke(), tr("Draw"));
-        
+
         cursorCrosshair = getCursor();
         cursorJoinNode = ImageProvider.getCursor("crosshair", "joinnode");
@@ -131,5 +132,5 @@
                         default:
                             Main.map.mapView.setCursor(cursorCrosshair);
-                            break;    
+                            break;
                     }
                 }
@@ -138,5 +139,5 @@
         } catch(Exception e) {}
     }
-    
+
     /**
      * Checks if a map redraw is required and does so if needed. Also updates the status bar
@@ -877,5 +878,6 @@
             // We already know oldHighlights is not empty, but shift is pressed.
             // We can assume the new node will be joined into an existing way
-            rv = tr("Insert new node into {0} way(s).", oldHighlights.size());
+            rv = trn("Insert new node into way.", "Insert new node into {0} ways.",
+            oldHighlights.size(), oldHighlights.size());
         } else {
             // oldHighlights may store a node or way, check if it's a node
@@ -884,5 +886,6 @@
                 rv = tr("Select node under cursor.");
             else
-                rv = tr("Insert new node into {0} way(s).", oldHighlights.size());
+                rv = trn("Insert new node into way.", "Insert new node into {0} ways.",
+                oldHighlights.size(), oldHighlights.size());
         }
 
@@ -896,10 +899,10 @@
                 rv += " " + tr("Continue way from last node.");
         }
-        
+
         Node n = mouseOnExistingNode;
         /*
          * Handle special case: Highlighted node == selected node => finish drawing
          */
-        
+
         if(n != null && Main.ds.getSelectedNodes().contains(n)) {
             if(wayIsFinished)