Index: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java	(revision 110)
+++ src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java	(revision 111)
@@ -2,4 +2,5 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.awt.event.ActionEvent;
@@ -44,5 +45,5 @@
 
 		private DownloadTask(Collection<OsmPrimitive> toDownload) {
-			super(tr("Downloading {0} segments", toDownload.size()));
+			super(trn("Downloading {0} segments", "Downloading {0} segment", toDownload.size(), toDownload.size()));
 			reader = new ObjectListDownloader(toDownload);
 			reader.setProgressInformation(currentAction, progress);
Index: src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java
===================================================================
--- src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java	(revision 110)
+++ src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java	(revision 111)
@@ -23,4 +23,5 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.I18n;
 import org.xml.sax.SAXException;
 
@@ -39,5 +40,5 @@
 	private boolean closeDialogCalled = false;
 
-	protected final JLabel currentAction = new JLabel(tr("Contacting the OSM server..."));
+	protected final JLabel currentAction = new JLabel(I18n.tr("Contacting the OSM server..."));
 	protected final BoundedRangeModel progress = progressBar.getModel();
 
Index: src/org/openstreetmap/josm/io/OsmReader.java
===================================================================
--- src/org/openstreetmap/josm/io/OsmReader.java	(revision 110)
+++ src/org/openstreetmap/josm/io/OsmReader.java	(revision 111)
@@ -6,7 +6,5 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.text.DateFormat;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Collection;
 import java.util.HashMap;
Index: src/org/openstreetmap/josm/tools/I18n.java
===================================================================
--- src/org/openstreetmap/josm/tools/I18n.java	(revision 110)
+++ src/org/openstreetmap/josm/tools/I18n.java	(revision 111)
@@ -1,5 +1,6 @@
 package org.openstreetmap.josm.tools;
 
-import java.text.MessageFormat;
+import org.openstreetmap.josm.Main;
+import org.xnap.commons.i18n.I18nFactory;
 
 /**
@@ -9,19 +10,20 @@
  */
 public class I18n {
+	private static org.xnap.commons.i18n.I18n i18n = I18nFactory.getI18n(Main.class);
+	
 	public static String tr(String text, Object... objects) {
-		MessageFormat mf = new MessageFormat(text);
-		return mf.format(objects);
+		return i18n.tr(text, objects);
 	}
 
 	public static String tr(String text) {
-		return text;
+		return i18n.tr(text);
 	}
 
 	public static String trn(String text, String pluralText, long n, Object... objects) {
-		return n==1 ? tr(text,objects) : tr(pluralText,objects);
+		return i18n.trn(text, pluralText, n, objects);
 	}
 
 	public static String trn(String text, String pluralText, long n) {
-		return n==1 ? text : pluralText;
+		return i18n.trn(text, pluralText, n);
 	}
 }