===================================================================
--- src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 2381)
+++ src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(working copy)
@@ -248,9 +248,12 @@
     }
 
     @Override public String getToolTipText() {
-        String tool = "";
-        tool += undeletedSize(data.getNodes())+" "+trn("node", "nodes", undeletedSize(data.getNodes()))+", ";
-        tool += undeletedSize(data.getWays())+" "+trn("way", "ways", undeletedSize(data.getWays()));
+        int nodes = undeletedSize(data.getNodes());
+        int ways = undeletedSize(data.getWays());
+
+        String tool = trn("{0} node", "{0} nodes", nodes, nodes)+", ";
+        tool += trn("{0} way", "{0} ways", ways, ways);
+
         if (data.version != null) {
             tool += ", " + tr("version {0}", data.version);
         }
@@ -501,9 +504,9 @@
         final JPanel p = new JPanel(new GridBagLayout());
         p.add(new JLabel(tr("{0} consists of:", getName())), GBC.eol());
         for (int i = 0; i < counter.normal.length; ++i) {
-            String s = counter.normal[i]+" "+trn(counter.names[i],counter.names[i]+"s",counter.normal[i]);
+            String s = trn("{0} "+counter.names[i],"{0} "+counter.names[i]+"s",counter.normal[i],counter.normal[i]);
             if (counter.deleted[i] > 0) {
-                s += tr(" ({0} deleted.)",counter.deleted[i]);
+                s += " ("+trn("{0} deleted","{0} deleted",counter.deleted[i],counter.deleted[i])+")";
             }
             p.add(new JLabel(s, ImageProvider.get("data", counter.names[i]), JLabel.HORIZONTAL), GBC.eop().insets(15,0,0,0));
         }