diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java
index 2877501a5987a4bc7950d0d27b5270c638d00590..282562346205c542e8d19bdd6298899996e62ff2 100644
--- a/core/java/src/net/i2p/data/DataHelper.java
+++ b/core/java/src/net/i2p/data/DataHelper.java
@@ -1380,25 +1380,25 @@ public class DataHelper {
             // {0,number,####} prevents 1234 from being output as 1,234 in the English locale.
             // If you want the digit separator in your locale, translate as {0}.
             // alternates: msec, msecs
-            t = ngettext("1 ms", "{0,number,####} ms", (int) ms);
+            t = ngettext("{0,number,####} ms", "{0,number,####} ms", (int) ms);
         } else if (ams < 2 * 60 * 1000) {
             // seconds
             // alternates: secs, sec. 'seconds' is probably too long.
-            t = ngettext("1 sec", "{0} sec", (int) (ms / 1000));
+            t = ngettext("{0} sec", "{0} sec", (int) (ms / 1000));
         } else if (ams < 120 * 60 * 1000) {
             // minutes
             // alternates: mins, min. 'minutes' is probably too long.
-            t = ngettext("1 min", "{0} min", (int) (ms / (60 * 1000)));
+            t = ngettext("{0} min", "{0} min", (int) (ms / (60 * 1000)));
         } else if (ams < 2 * 24 * 60 * 60 * 1000) {
             // hours
             // alternates: hrs, hr., hrs.
-            t = ngettext("1 hour", "{0} hours", (int) (ms / (60 * 60 * 1000)));
+            t = ngettext("{0} hour", "{0} hours", (int) (ms / (60 * 60 * 1000)));
         } else if (ams < 3L * 365 * 24 * 60 * 60 * 1000) {
             // days
-            t = ngettext("1 day", "{0} days", (int) (ms / (24 * 60 * 60 * 1000)));
+            t = ngettext("{0} day", "{0} days", (int) (ms / (24 * 60 * 60 * 1000)));
         } else if (ams < 1000L * 365 * 24 * 60 * 60 * 1000) {
             // years
-            t = ngettext("1 year", "{0} years", (int) (ms / (365L * 24 * 60 * 60 * 1000)));
+            t = ngettext("{0} year", "{0} years", (int) (ms / (365L * 24 * 60 * 60 * 1000)));
         } else {
             return _t("n/a");
         }
@@ -1429,23 +1429,23 @@ public class DataHelper {
         if (adms < 0.000000001d) {
             return "0";
         } else if (adms < 0.001d) {
-            t = ngettext("1 ns", "{0,number,###} ns", (int) Math.round(ms * 1000000d));
+            t = ngettext("{0,number,####} ns", "{0,number,###} ns", (int) Math.round(ms * 1000000d));
         } else if (adms < 1.0d) {
-            t = ngettext("1 μs", "{0,number,###} μs", (int) Math.round(ms * 1000d));
+            t = ngettext("{0,number,####} μs", "{0,number,###} μs", (int) Math.round(ms * 1000d));
         } else if (ams < 3 * 1000) {
-            t = ngettext("1 ms", "{0,number,####} ms", (int) Math.round(ms));
+            t = ngettext("{0,number,####} ms", "{0,number,####} ms", (int) Math.round(ms));
         } else if (ams < 2 * 60 * 1000) {
-            t = ngettext("1 sec", "{0} sec", (int) (ms / 1000));
+            t = ngettext("{0} sec", "{0} sec", (int) (ms / 1000));
         } else if (ams < 120 * 60 * 1000) {
-            t = ngettext("1 min", "{0} min", (int) (ms / (60 * 1000)));
+            t = ngettext("{0} min", "{0} min", (int) (ms / (60 * 1000)));
         } else if (ams < 2 * 24 * 60 * 60 * 1000) {
-            t = ngettext("1 hour", "{0} hours", (int) (ms / (60 * 60 * 1000)));
+            t = ngettext("{0} hour", "{0} hours", (int) (ms / (60 * 60 * 1000)));
         } else if (ams < 3L * 365 * 24 * 60 * 60 * 1000) {
             // days
-            t = ngettext("1 day", "{0} days", (int) (ms / (24 * 60 * 60 * 1000)));
+            t = ngettext("{0} day", "{0} days", (int) (ms / (24 * 60 * 60 * 1000)));
         } else if (ams < 1000L * 365 * 24 * 60 * 60 * 1000) {
             // years
-            t = ngettext("1 year", "{0} years", (int) (ms / (365L * 24 * 60 * 60 * 1000)));
+            t = ngettext("{0} year", "{0} years", (int) (ms / (365L * 24 * 60 * 60 * 1000)));
         } else {
             return _t("n/a");
         }
diff --git a/core/locale/messages_ar.po b/core/locale/messages_ar.po
index ddaa6767ef9670b39bd2c1f71ef30864a8241026..284122d68977a39bee31d00837968b95391d1e40 100644
--- a/core/locale/messages_ar.po
+++ b/core/locale/messages_ar.po
@@ -35,7 +35,7 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
 msgstr[0] ""
 msgstr[1] ""
@@ -49,7 +49,7 @@ msgstr[5] ""
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
 msgstr[0] ""
 msgstr[1] ""
@@ -63,7 +63,7 @@ msgstr[5] ""
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
 msgstr[0] ""
 msgstr[1] ""
@@ -77,7 +77,7 @@ msgstr[5] ""
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
 msgstr[0] ""
 msgstr[1] "{0} ساعات"
@@ -90,7 +90,7 @@ msgstr[5] ""
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
 msgstr[0] ""
 msgstr[1] ""
@@ -103,7 +103,7 @@ msgstr[5] ""
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
 msgstr[0] ""
 msgstr[1] ""
@@ -119,7 +119,7 @@ msgstr ""
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
 msgstr[0] ""
 msgstr[1] ""
@@ -130,7 +130,7 @@ msgstr[5] ""
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
 msgstr[0] ""
 msgstr[1] ""
diff --git a/core/locale/messages_az.po b/core/locale/messages_az.po
index 3b963feb8bd2d7bf689b07ff918d4a2bbc1835b4..6e9edb186dd33a6313f2431c1f81cdbd0dab44c7 100644
--- a/core/locale/messages_az.po
+++ b/core/locale/messages_az.po
@@ -29,7 +29,7 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
 msgstr[0] ""
 msgstr[1] ""
@@ -39,7 +39,7 @@ msgstr[1] ""
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
 msgstr[0] ""
 msgstr[1] ""
@@ -49,7 +49,7 @@ msgstr[1] ""
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
 msgstr[0] ""
 msgstr[1] ""
@@ -59,7 +59,7 @@ msgstr[1] ""
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
 msgstr[0] ""
 msgstr[1] ""
@@ -68,7 +68,7 @@ msgstr[1] ""
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
 msgstr[0] ""
 msgstr[1] ""
@@ -77,7 +77,7 @@ msgstr[1] ""
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
 msgstr[0] ""
 msgstr[1] ""
@@ -89,14 +89,14 @@ msgstr "n/a"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
 msgstr[0] ""
 msgstr[1] ""
diff --git a/core/locale/messages_cs.po b/core/locale/messages_cs.po
index 5df26affa505851a110ec1ade9228b9d5f8ab9eb..eb73a6f81ab8eb2fc0aff1c86d0dde4e02e99cac 100644
--- a/core/locale/messages_cs.po
+++ b/core/locale/messages_cs.po
@@ -33,7 +33,7 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0} ms"
 msgid_plural "{0,number,####} ms"
 msgstr[0] "{0,number,####} ms"
 msgstr[1] "{0,number,####} ms"
@@ -45,7 +45,7 @@ msgstr[3] "{0,number,####} ms"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
 msgstr[0] "{0} sek."
 msgstr[1] "{0} sek."
@@ -57,7 +57,7 @@ msgstr[3] "{0} sek."
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
 msgstr[0] "{0} minuta"
 msgstr[1] "{0} minut"
@@ -69,7 +69,7 @@ msgstr[3] "{0} minut"
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
 msgstr[0] "{0} hodina"
 msgstr[1] "{0} hodiny"
@@ -80,7 +80,7 @@ msgstr[3] "{0} hodin"
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
 msgstr[0] "{0} den"
 msgstr[1] "{0} dny"
@@ -91,7 +91,7 @@ msgstr[3] "{0} dnů"
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
 msgstr[0] ""
 msgstr[1] ""
@@ -105,7 +105,7 @@ msgstr "neaplikovatelné"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
 msgstr[0] ""
 msgstr[1] ""
@@ -114,7 +114,7 @@ msgstr[3] ""
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
 msgstr[0] ""
 msgstr[1] ""
diff --git a/core/locale/messages_da.po b/core/locale/messages_da.po
index 6c79ae99b3a32a96b2fb1e9b87d384adb0e1c134..90c93f4d256c14ef9e543511c12e83061a2d9a19 100644
--- a/core/locale/messages_da.po
+++ b/core/locale/messages_da.po
@@ -32,9 +32,9 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
-msgstr[0] "1 ms"
+msgstr[0] "{0,number,####} ms"
 msgstr[1] "{0,number,####} ms"
 
 #. seconds
@@ -42,9 +42,9 @@ msgstr[1] "{0,number,####} ms"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
-msgstr[0] "1 sek"
+msgstr[0] "{0} sek"
 msgstr[1] "{0} sek"
 
 #. minutes
@@ -52,9 +52,9 @@ msgstr[1] "{0} sek"
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
-msgstr[0] "1 min"
+msgstr[0] "{0} min"
 msgstr[1] "{0} min"
 
 #. hours
@@ -62,25 +62,25 @@ msgstr[1] "{0} min"
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
-msgstr[0] "1 time"
+msgstr[0] "{0} time"
 msgstr[1] "{0} timer"
 
 #. days
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
-msgstr[0] "1 dag"
+msgstr[0] "{0} dag"
 msgstr[1] "{0} dage"
 
 #. years
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
 msgstr[0] ""
 msgstr[1] ""
@@ -92,16 +92,16 @@ msgstr "Ikke tingængelig "
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0} ns"
 msgid_plural "{0,number,###} ns"
-msgstr[0] "1 ns"
+msgstr[0] "{0,number,####} ns"
 msgstr[1] "{0,number,###} ns"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
-msgstr[0] "1 μs"
+msgstr[0] "{0,number,####} μs"
 msgstr[1] "{0,number,###} μs"
 
 #: ../java/src/net/i2p/util/LogWriter.java:161
diff --git a/core/locale/messages_de.po b/core/locale/messages_de.po
index 81ca387edce9c397a2630a78ff2d9a21bee312a7..c1ad392b5e066c0a5f6ef9d32c6402a1b7a74ac0 100644
--- a/core/locale/messages_de.po
+++ b/core/locale/messages_de.po
@@ -49,9 +49,9 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
-msgstr[0] "1 ms"
+msgstr[0] "{0,number,####} ms"
 msgstr[1] "{0,number,####} ms"
 
 #. seconds
@@ -59,9 +59,9 @@ msgstr[1] "{0,number,####} ms"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
-msgstr[0] "1 s"
+msgstr[0] "{0} s"
 msgstr[1] "{0} s"
 
 #. minutes
@@ -69,9 +69,9 @@ msgstr[1] "{0} s"
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
-msgstr[0] "1 Minute"
+msgstr[0] "{0} Minute"
 msgstr[1] "{0} Minuten"
 
 #. hours
@@ -79,16 +79,16 @@ msgstr[1] "{0} Minuten"
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
-msgstr[0] "1 Stunde"
+msgstr[0] "{0} Stunde"
 msgstr[1] "{0} Stunden"
 
 #. days
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
 msgstr[0] "einen Tag"
 msgstr[1] "{0} Tage"
@@ -97,9 +97,9 @@ msgstr[1] "{0} Tage"
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
-msgstr[0] "1 Jahr"
+msgstr[0] "{0} Jahr"
 msgstr[1] "{0} Jahre"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1403
@@ -109,14 +109,14 @@ msgstr "nicht verfügbar"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
 msgstr[0] "{0,number,###} ns"
 msgstr[1] "{0,number,###} ns"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
 msgstr[0] "{0,number,###} μs"
 msgstr[1] "{0,number,###} μs"
diff --git a/core/locale/messages_el.po b/core/locale/messages_el.po
index 7035c56942892db6ecea0407a802cb5d9a487958..644c4c84df2b10cafbbf159403032551fbd67f69 100644
--- a/core/locale/messages_el.po
+++ b/core/locale/messages_el.po
@@ -37,9 +37,9 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
-msgstr[0] "1 μιλιδευτερόλεπτο"
+msgstr[0] "{0,number,####} μιλιδευτερόλεπτο"
 msgstr[1] "{0,number,####} μιλιδευτερόλεπτα"
 
 #. seconds
@@ -47,9 +47,9 @@ msgstr[1] "{0,number,####} μιλιδευτερόλεπτα"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
-msgstr[0] "1 δευτ"
+msgstr[0] "{0} δευτ"
 msgstr[1] "{0} δευτ"
 
 #. minutes
@@ -57,9 +57,9 @@ msgstr[1] "{0} δευτ"
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
-msgstr[0] "1 λεπτ"
+msgstr[0] "{0} λεπτ"
 msgstr[1] "{0} λεπτ"
 
 #. hours
@@ -67,7 +67,7 @@ msgstr[1] "{0} λεπτ"
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
 msgstr[0] "{0}  ώρα"
 msgstr[1] "{0} ώρες"
@@ -76,7 +76,7 @@ msgstr[1] "{0} ώρες"
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
 msgstr[0] "{0} μέρα"
 msgstr[1] "{0} μέρες"
@@ -85,7 +85,7 @@ msgstr[1] "{0} μέρες"
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
 msgstr[0] "{0} χρόνος"
 msgstr[1] "{0} χρόνια"
@@ -97,14 +97,14 @@ msgstr "Μ/Δ"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
 msgstr[0] ""
 msgstr[1] ""
diff --git a/core/locale/messages_en.po b/core/locale/messages_en.po
index 66a264ff1f09d6b1fa4d173f86dc2427961989c9..7d4aee38faa2f5fff41cd8084e6341a5f2be5720 100644
--- a/core/locale/messages_en.po
+++ b/core/locale/messages_en.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P routerconsole\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-17 17:31+0000\n"
+"POT-Creation-Date: 2019-12-17 17:54+0000\n"
 "PO-Revision-Date: 2010-06-15 14:09+0100\n"
 "Last-Translator: duck <duck@mail.i2p>\n"
 "Language-Team: duck <duck@mail.i2p>\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
 msgstr[0] ""
 msgstr[1] ""
@@ -39,7 +39,7 @@ msgstr[1] ""
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
 msgstr[0] ""
 msgstr[1] ""
@@ -49,7 +49,7 @@ msgstr[1] ""
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
 msgstr[0] ""
 msgstr[1] ""
@@ -59,7 +59,7 @@ msgstr[1] ""
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
 msgstr[0] ""
 msgstr[1] ""
@@ -68,7 +68,7 @@ msgstr[1] ""
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
 msgstr[0] ""
 msgstr[1] ""
@@ -77,7 +77,7 @@ msgstr[1] ""
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
 msgstr[0] ""
 msgstr[1] ""
@@ -89,14 +89,14 @@ msgstr ""
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
 msgstr[0] ""
 msgstr[1] ""
diff --git a/core/locale/messages_es.po b/core/locale/messages_es.po
index 605f706d50e48855b150947de4dfadeeaeed5888..34c3970df34954cfd0ffee9209cd785831b99df3 100644
--- a/core/locale/messages_es.po
+++ b/core/locale/messages_es.po
@@ -45,9 +45,9 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
-msgstr[0] "1 ms"
+msgstr[0] "{0,number,####} ms"
 msgstr[1] "{0,number,####} ms"
 
 #. seconds
@@ -55,9 +55,9 @@ msgstr[1] "{0,number,####} ms"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
-msgstr[0] "1 s"
+msgstr[0] "{0} s"
 msgstr[1] "{0} s"
 
 #. minutes
@@ -65,9 +65,9 @@ msgstr[1] "{0} s"
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
-msgstr[0] "1 min"
+msgstr[0] "{0} min"
 msgstr[1] "{0} min"
 
 #. hours
@@ -75,27 +75,27 @@ msgstr[1] "{0} min"
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
-msgstr[0] "1 hora"
+msgstr[0] "{0} hora"
 msgstr[1] "{0} horas"
 
 #. days
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
-msgstr[0] "1 día"
+msgstr[0] "{0} día"
 msgstr[1] "{0} días"
 
 #. years
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
-msgstr[0] "1 año"
+msgstr[0] "{0} año"
 msgstr[1] "{0} años"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1403
@@ -105,16 +105,16 @@ msgstr "n/d"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
-msgstr[0] "1 ns"
+msgstr[0] "{0,number,####} ns"
 msgstr[1] "{0,number,###} ns"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
-msgstr[0] "1 μs"
+msgstr[0] "{0,number,####} μs"
 msgstr[1] "{0,number,###} μs"
 
 #: ../java/src/net/i2p/util/LogWriter.java:161
diff --git a/core/locale/messages_et.po b/core/locale/messages_et.po
index f4b7a5e8438772d87578fdda44714b4eb3e781b7..01f30cc62da81f8461b8cbc4b6510d24d739bed8 100644
--- a/core/locale/messages_et.po
+++ b/core/locale/messages_et.po
@@ -32,9 +32,9 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
-msgstr[0] "1 ms"
+msgstr[0] "{0,number,####} ms"
 msgstr[1] "{0,number,####} ms"
 
 #. seconds
@@ -42,9 +42,9 @@ msgstr[1] "{0,number,####} ms"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
-msgstr[0] "1 s"
+msgstr[0] "{0} s"
 msgstr[1] "{0} s"
 
 #. minutes
@@ -52,9 +52,9 @@ msgstr[1] "{0} s"
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
-msgstr[0] "1 min"
+msgstr[0] "{0} min"
 msgstr[1] "{0} min"
 
 #. hours
@@ -62,25 +62,25 @@ msgstr[1] "{0} min"
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
-msgstr[0] "1 tund"
+msgstr[0] "{0} tund"
 msgstr[1] "{0} tundi"
 
 #. days
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
-msgstr[0] "1 päev"
+msgstr[0] "{0} päev"
 msgstr[1] "{0} päeva"
 
 #. years
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
 msgstr[0] ""
 msgstr[1] ""
@@ -92,14 +92,14 @@ msgstr "puudub"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
 msgstr[0] ""
 msgstr[1] ""
diff --git a/core/locale/messages_fa.po b/core/locale/messages_fa.po
index 50fc3ced991e891dd59b6e0b724c0ed304c83d34..cf4b9ce08555530cd700c55ac5e26dc16c8f148f 100644
--- a/core/locale/messages_fa.po
+++ b/core/locale/messages_fa.po
@@ -31,7 +31,7 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
 msgstr[0] ""
 msgstr[1] ""
@@ -41,7 +41,7 @@ msgstr[1] ""
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
 msgstr[0] "{0} ثانیه"
 msgstr[1] "{0} ثانیه"
@@ -51,7 +51,7 @@ msgstr[1] "{0} ثانیه"
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
 msgstr[0] ""
 msgstr[1] ""
@@ -61,7 +61,7 @@ msgstr[1] ""
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
 msgstr[0] ""
 msgstr[1] ""
@@ -70,7 +70,7 @@ msgstr[1] ""
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
 msgstr[0] ""
 msgstr[1] ""
@@ -79,7 +79,7 @@ msgstr[1] ""
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
 msgstr[0] ""
 msgstr[1] ""
@@ -91,14 +91,14 @@ msgstr "n/a"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
 msgstr[0] ""
 msgstr[1] ""
diff --git a/core/locale/messages_fi.po b/core/locale/messages_fi.po
index 18e80f6b018826ea1576125fa4f1fe995ee46ae9..f2416b8d3322e4f4dd7b226e53c714d66eb9ede8 100644
--- a/core/locale/messages_fi.po
+++ b/core/locale/messages_fi.po
@@ -36,9 +36,9 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
-msgstr[0] "1 ms"
+msgstr[0] "{0,number,####} ms"
 msgstr[1] "{0,number,####} ms"
 
 #. seconds
@@ -46,9 +46,9 @@ msgstr[1] "{0,number,####} ms"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
-msgstr[0] "1 s"
+msgstr[0] "{0} s"
 msgstr[1] "{0} s"
 
 #. minutes
@@ -56,9 +56,9 @@ msgstr[1] "{0} s"
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
-msgstr[0] "1 min"
+msgstr[0] "{0} min"
 msgstr[1] "{0} min"
 
 #. hours
@@ -66,27 +66,27 @@ msgstr[1] "{0} min"
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
-msgstr[0] "1 tunti"
+msgstr[0] "{0} tunti"
 msgstr[1] "{0} tuntia"
 
 #. days
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
-msgstr[0] "1 päivä"
+msgstr[0] "{0} päivä"
 msgstr[1] "{0} päivää"
 
 #. years
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
-msgstr[0] "1 vuosi"
+msgstr[0] "{0} vuosi"
 msgstr[1] "{0} vuotta"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1403
@@ -96,16 +96,16 @@ msgstr "-"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
-msgstr[0] "1 ns"
+msgstr[0] "{0,number,####} ns"
 msgstr[1] "{0,number,###} ns"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
-msgstr[0] "1 μs"
+msgstr[0] "{0,number,####} μs"
 msgstr[1] "{0,number,###} μs"
 
 #: ../java/src/net/i2p/util/LogWriter.java:161
diff --git a/core/locale/messages_fr.po b/core/locale/messages_fr.po
index 7903e842f8d89052d20d7bdb442d0ff20e947cb1..30cea22ebb398ea18bb90a1557b9465433686cec 100644
--- a/core/locale/messages_fr.po
+++ b/core/locale/messages_fr.po
@@ -49,9 +49,9 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
-msgstr[0] "1 ms"
+msgstr[0] "{0,number,####} ms"
 msgstr[1] "{0,number,####} ms"
 
 #. seconds
@@ -59,9 +59,9 @@ msgstr[1] "{0,number,####} ms"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
-msgstr[0] "1 s"
+msgstr[0] "{0} s"
 msgstr[1] "{0} s"
 
 #. minutes
@@ -69,9 +69,9 @@ msgstr[1] "{0} s"
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
-msgstr[0] "1 min"
+msgstr[0] "{0} min"
 msgstr[1] "{0} min"
 
 #. hours
@@ -79,27 +79,27 @@ msgstr[1] "{0} min"
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
-msgstr[0] "1 heure"
+msgstr[0] "{0} heure"
 msgstr[1] "{0} heures"
 
 #. days
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
-msgstr[0] "1 jour"
+msgstr[0] "{0} jour"
 msgstr[1] "{0} jours"
 
 #. years
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
-msgstr[0] "1 an"
+msgstr[0] "{0} an"
 msgstr[1] "{0} ans"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1403
@@ -109,16 +109,16 @@ msgstr "n.d."
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
-msgstr[0] "1 ns"
+msgstr[0] "{0,number,####} ns"
 msgstr[1] "{0,number,###} ns"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
-msgstr[0] "1 ms"
+msgstr[0] "{0,number,####} ms"
 msgstr[1] "{0,number,###} ms"
 
 #: ../java/src/net/i2p/util/LogWriter.java:161
diff --git a/core/locale/messages_hu.po b/core/locale/messages_hu.po
index 6dc467550046234ef4cea25788d60ebb6da5b407..16559fb3558adbae7bf88ea810cb44af6f7a7377 100644
--- a/core/locale/messages_hu.po
+++ b/core/locale/messages_hu.po
@@ -33,9 +33,9 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
-msgstr[0] "1 ms"
+msgstr[0] "{0,number,####} ms"
 msgstr[1] "{0,number,####} ms"
 
 #. seconds
@@ -43,9 +43,9 @@ msgstr[1] "{0,number,####} ms"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
-msgstr[0] "1 mp"
+msgstr[0] "{0} mp"
 msgstr[1] "{0} mp"
 
 #. minutes
@@ -53,9 +53,9 @@ msgstr[1] "{0} mp"
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
-msgstr[0] "1 perc"
+msgstr[0] "{0} perc"
 msgstr[1] "{0} perc"
 
 #. hours
@@ -63,27 +63,27 @@ msgstr[1] "{0} perc"
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
-msgstr[0] "1 óra"
+msgstr[0] "{0} óra"
 msgstr[1] "{0} óra"
 
 #. days
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
-msgstr[0] "1 nap"
+msgstr[0] "{0} nap"
 msgstr[1] "{0} nap"
 
 #. years
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
-msgstr[0] "1 év"
+msgstr[0] "{0} év"
 msgstr[1] "{0} év"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1403
@@ -93,14 +93,14 @@ msgstr "nem elérhető"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
 msgstr[0] ""
 msgstr[1] ""
diff --git a/core/locale/messages_in.po b/core/locale/messages_in.po
index 5a29b75e2e546d3407f38d2d0fa898cf0a9ad174..db24059938ca8973676c3429dd7f81e6891d80ac 100644
--- a/core/locale/messages_in.po
+++ b/core/locale/messages_in.po
@@ -30,7 +30,7 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
 msgstr[0] "{0,number,####} mili detik"
 
@@ -39,7 +39,7 @@ msgstr[0] "{0,number,####} mili detik"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
 msgstr[0] "{0} detik"
 
@@ -48,7 +48,7 @@ msgstr[0] "{0} detik"
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
 msgstr[0] "{0} menit"
 
@@ -57,7 +57,7 @@ msgstr[0] "{0} menit"
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
 msgstr[0] "{0} jam"
 
@@ -65,7 +65,7 @@ msgstr[0] "{0} jam"
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
 msgstr[0] "{0} hari"
 
@@ -73,7 +73,7 @@ msgstr[0] "{0} hari"
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
 msgstr[0] "{0} tahun"
 
@@ -84,13 +84,13 @@ msgstr "tidak ada"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
 msgstr[0] "{0,number,###} nano detik"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
 msgstr[0] "{0,number,###} mikro detik"
 
diff --git a/core/locale/messages_it.po b/core/locale/messages_it.po
index 75f6d980627dc8bf841f34169da70019aa23830c..fc5165a6688cb7d3c309fd65884b0b4a4c4f6c7e 100644
--- a/core/locale/messages_it.po
+++ b/core/locale/messages_it.po
@@ -48,9 +48,9 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
-msgstr[0] "1 ms"
+msgstr[0] "{0,number,####} ms"
 msgstr[1] "{0,number,####} ms"
 
 #. seconds
@@ -58,9 +58,9 @@ msgstr[1] "{0,number,####} ms"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
-msgstr[0] "1 sec"
+msgstr[0] "{0} sec"
 msgstr[1] "{0} sec"
 
 #. minutes
@@ -68,9 +68,9 @@ msgstr[1] "{0} sec"
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
-msgstr[0] "1 min"
+msgstr[0] "{0} min"
 msgstr[1] "{0} min"
 
 #. hours
@@ -78,27 +78,27 @@ msgstr[1] "{0} min"
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
-msgstr[0] "1 ora"
+msgstr[0] "{0} ora"
 msgstr[1] "{0} ore"
 
 #. days
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
-msgstr[0] "1 giorno"
+msgstr[0] "{0} giorno"
 msgstr[1] "{0} giorni"
 
 #. years
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
-msgstr[0] "1 anno"
+msgstr[0] "{0} anno"
 msgstr[1] "{0} anni"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1403
@@ -108,16 +108,16 @@ msgstr "n/a"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
-msgstr[0] "1 ns"
+msgstr[0] "{0,number,####} ns"
 msgstr[1] "{0,number,###} ns"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
-msgstr[0] "1 μs"
+msgstr[0] "{0,number,####} μs"
 msgstr[1] "{0,number,###} μs"
 
 #: ../java/src/net/i2p/util/LogWriter.java:161
diff --git a/core/locale/messages_ja.po b/core/locale/messages_ja.po
index ffd9f2969d06b1af636b31709d498f7a09048b99..5e99581cab939fac585f6c0d9a1ca9d7f62b64ae 100644
--- a/core/locale/messages_ja.po
+++ b/core/locale/messages_ja.po
@@ -39,7 +39,7 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
 msgstr[0] "{0,number,####} ms"
 
@@ -48,7 +48,7 @@ msgstr[0] "{0,number,####} ms"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
 msgstr[0] "{0} 秒"
 
@@ -57,7 +57,7 @@ msgstr[0] "{0} 秒"
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
 msgstr[0] "{0} 分"
 
@@ -66,7 +66,7 @@ msgstr[0] "{0} 分"
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
 msgstr[0] "{0} 時間"
 
@@ -74,7 +74,7 @@ msgstr[0] "{0} 時間"
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
 msgstr[0] "{0} æ—¥"
 
@@ -82,7 +82,7 @@ msgstr[0] "{0} æ—¥"
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
 msgstr[0] "{0} å¹´"
 
@@ -93,13 +93,13 @@ msgstr "n/a"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
 msgstr[0] "{0,number,###} ns"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
 msgstr[0] "{0,number,###} μs"
 
diff --git a/core/locale/messages_ko.po b/core/locale/messages_ko.po
index 06ab5b18bfd8518a4e8a99167b89b9bff2433cec..90faf25cd86b2195ce8d8f60ca9e9d904e823085 100644
--- a/core/locale/messages_ko.po
+++ b/core/locale/messages_ko.po
@@ -30,7 +30,7 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
 msgstr[0] "{0,number,####} ms"
 
@@ -39,7 +39,7 @@ msgstr[0] "{0,number,####} ms"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
 msgstr[0] "{0} ì´ˆ"
 
@@ -48,7 +48,7 @@ msgstr[0] "{0} ì´ˆ"
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
 msgstr[0] "{0} 분"
 
@@ -57,7 +57,7 @@ msgstr[0] "{0} 분"
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
 msgstr[0] "{0} 시간"
 
@@ -65,7 +65,7 @@ msgstr[0] "{0} 시간"
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
 msgstr[0] "{0} 일"
 
@@ -73,7 +73,7 @@ msgstr[0] "{0} 일"
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
 msgstr[0] "{0} ë…„"
 
@@ -84,13 +84,13 @@ msgstr "n/a"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
 msgstr[0] "{0,number,###} ns"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
 msgstr[0] "{0,number,###} μs"
 
diff --git a/core/locale/messages_nb.po b/core/locale/messages_nb.po
index 7490571d7ae0b231c27c7ce938435f5ee482ecd0..2ba95c983e173d766c7a845212d0711c6ded8161 100644
--- a/core/locale/messages_nb.po
+++ b/core/locale/messages_nb.po
@@ -36,9 +36,9 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
-msgstr[0] "1 ms"
+msgstr[0] "{0,number,####} ms"
 msgstr[1] "{0,number,####} ms"
 
 #. seconds
@@ -46,9 +46,9 @@ msgstr[1] "{0,number,####} ms"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
-msgstr[0] "1 sek"
+msgstr[0] "{0} sek"
 msgstr[1] "{0} sek"
 
 #. minutes
@@ -56,9 +56,9 @@ msgstr[1] "{0} sek"
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
-msgstr[0] "1 min"
+msgstr[0] "{0} min"
 msgstr[1] "{0} min"
 
 #. hours
@@ -66,25 +66,25 @@ msgstr[1] "{0} min"
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
-msgstr[0] "1 time"
+msgstr[0] "{0} time"
 msgstr[1] "{0} timer"
 
 #. days
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
-msgstr[0] "1 dag"
+msgstr[0] "{0} dag"
 msgstr[1] "{0} dager"
 
 #. years
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
 msgstr[0] "ett år"
 msgstr[1] "{0} år"
@@ -96,16 +96,16 @@ msgstr "n/a"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
-msgstr[0] "1 ns"
+msgstr[0] "{0,number,####} ns"
 msgstr[1] "{0,number,###} ns"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
-msgstr[0] "1 μs"
+msgstr[0] "{0,number,####} μs"
 msgstr[1] "{0,number,###} μs"
 
 #: ../java/src/net/i2p/util/LogWriter.java:161
diff --git a/core/locale/messages_nl.po b/core/locale/messages_nl.po
index bab5a469207c8c1046e7228c90e3898283d584cd..dc71464fa8f8610da2d5769caae98f57b2151272 100644
--- a/core/locale/messages_nl.po
+++ b/core/locale/messages_nl.po
@@ -47,9 +47,9 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
-msgstr[0] "1 ms"
+msgstr[0] "{0,number,####} ms"
 msgstr[1] "{0,number,####} ms"
 
 #. seconds
@@ -57,9 +57,9 @@ msgstr[1] "{0,number,####} ms"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
-msgstr[0] "1 s"
+msgstr[0] "{0} s"
 msgstr[1] "{0} s"
 
 #. minutes
@@ -67,9 +67,9 @@ msgstr[1] "{0} s"
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
-msgstr[0] "1 min"
+msgstr[0] "{0} min"
 msgstr[1] "{0} min"
 
 #. hours
@@ -77,27 +77,27 @@ msgstr[1] "{0} min"
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
-msgstr[0] "1 uur"
+msgstr[0] "{0} uur"
 msgstr[1] "{0} uur"
 
 #. days
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
-msgstr[0] "1 dag"
+msgstr[0] "{0} dag"
 msgstr[1] "{0} dagen"
 
 #. years
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
-msgstr[0] "1 jaar"
+msgstr[0] "{0} jaar"
 msgstr[1] "{0} jaar"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1403
@@ -107,16 +107,16 @@ msgstr "nvt"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
-msgstr[0] "1 ns"
+msgstr[0] "{0,number,####} ns"
 msgstr[1] "{0,number,###} ns"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
-msgstr[0] "1 μs"
+msgstr[0] "{0,number,####} μs"
 msgstr[1] "{0,number,###} μs"
 
 #: ../java/src/net/i2p/util/LogWriter.java:161
diff --git a/core/locale/messages_pl.po b/core/locale/messages_pl.po
index 13e5b5cc70e42e55138fea8f14819e7c58604af7..1385e28a1ceb824b0780cea14741a8ea09dbeef4 100644
--- a/core/locale/messages_pl.po
+++ b/core/locale/messages_pl.po
@@ -48,9 +48,9 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
-msgstr[0] "1 ms"
+msgstr[0] "{0,number,####} ms"
 msgstr[1] "{0,number,####} ms"
 msgstr[2] "{0,number,####} ms"
 msgstr[3] "{0,number,####} msconfigure ui"
@@ -60,9 +60,9 @@ msgstr[3] "{0,number,####} msconfigure ui"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
-msgstr[0] "1 sek"
+msgstr[0] "{0} sek"
 msgstr[1] "{0} sek"
 msgstr[2] "{0} sek"
 msgstr[3] "{0} sek"
@@ -72,9 +72,9 @@ msgstr[3] "{0} sek"
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
-msgstr[0] "1 min"
+msgstr[0] "{0} min"
 msgstr[1] "{0} min"
 msgstr[2] "{0} min"
 msgstr[3] "{0} min"
@@ -84,9 +84,9 @@ msgstr[3] "{0} min"
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
-msgstr[0] "1 godz"
+msgstr[0] "{0} godz"
 msgstr[1] "{0} godz"
 msgstr[2] "{0} godz"
 msgstr[3] "{0} godz"
@@ -95,9 +95,9 @@ msgstr[3] "{0} godz"
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
-msgstr[0] "1 dzień"
+msgstr[0] "{0} dzień"
 msgstr[1] "{0} dni"
 msgstr[2] "{0} dni"
 msgstr[3] "{0} dni"
@@ -106,9 +106,9 @@ msgstr[3] "{0} dni"
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
-msgstr[0] "1 rok"
+msgstr[0] "{0} rok"
 msgstr[1] "{0} lata"
 msgstr[2] "{0} lat"
 msgstr[3] "{0} lat"
@@ -120,18 +120,18 @@ msgstr "n/d"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
-msgstr[0] "1 ns"
+msgstr[0] "{0,number,####} ns"
 msgstr[1] "{0,number,###} ns"
 msgstr[2] "{0,number,###} ns"
 msgstr[3] "{0,number,###} ns"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
-msgstr[0] "1 μs"
+msgstr[0] "{0,number,####} μs"
 msgstr[1] "{0,number,###} μs"
 msgstr[2] "{0,number,###} μs"
 msgstr[3] "{0,number,###} μs"
diff --git a/core/locale/messages_pt.po b/core/locale/messages_pt.po
index dbabda822f10e9ebf30e4680e838a19d199e5095..8983a99e2687253d0fd8579207e4f0776f5d1c61 100644
--- a/core/locale/messages_pt.po
+++ b/core/locale/messages_pt.po
@@ -55,7 +55,7 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
 msgstr[0] "{0,number,####} ms"
 msgstr[1] "{0,number,####} ms"
@@ -65,9 +65,9 @@ msgstr[1] "{0,number,####} ms"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
-msgstr[0] "1 seg"
+msgstr[0] "{0} seg"
 msgstr[1] "{0} seg"
 
 #. minutes
@@ -75,9 +75,9 @@ msgstr[1] "{0} seg"
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
-msgstr[0] "1 min"
+msgstr[0] "{0} min"
 msgstr[1] "{0} min"
 
 #. hours
@@ -85,25 +85,25 @@ msgstr[1] "{0} min"
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
-msgstr[0] "1 hora"
+msgstr[0] "{0} hora"
 msgstr[1] "{0} horas"
 
 #. days
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
-msgstr[0] "1 dia"
+msgstr[0] "{0} dia"
 msgstr[1] "{0} dias"
 
 #. years
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
 msgstr[0] "{0} anos"
 msgstr[1] "{0} anos"
@@ -115,16 +115,16 @@ msgstr "indisponível"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
-msgstr[0] "1 ns"
+msgstr[0] "{0,number,####} ns"
 msgstr[1] "{0,number,###} ns"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
-msgstr[0] "1 μs"
+msgstr[0] "{0,number,####} μs"
 msgstr[1] "{0,number,###} μs"
 
 #: ../java/src/net/i2p/util/LogWriter.java:161
diff --git a/core/locale/messages_pt_BR.po b/core/locale/messages_pt_BR.po
index d0a7d48049114a2ce772448d392a18f3da820bc2..4c6be3a0af7ab935e26fbb1d5b035ccf38d373b2 100644
--- a/core/locale/messages_pt_BR.po
+++ b/core/locale/messages_pt_BR.po
@@ -35,9 +35,9 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
-msgstr[0] "1 ms"
+msgstr[0] "{0,number,####} ms"
 msgstr[1] "{0,number,####} ms"
 
 #. seconds
@@ -45,9 +45,9 @@ msgstr[1] "{0,number,####} ms"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
-msgstr[0] "1 seg"
+msgstr[0] "{0} seg"
 msgstr[1] "{0} seg"
 
 #. minutes
@@ -55,7 +55,7 @@ msgstr[1] "{0} seg"
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
 msgstr[0] "{0} min"
 msgstr[1] "{0} min"
@@ -65,7 +65,7 @@ msgstr[1] "{0} min"
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
 msgstr[0] "{0} horas"
 msgstr[1] "{0} horas"
@@ -74,7 +74,7 @@ msgstr[1] "{0} horas"
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
 msgstr[0] "{0} dias"
 msgstr[1] "{0} dias"
@@ -83,9 +83,9 @@ msgstr[1] "{0} dias"
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
-msgstr[0] "1 ano"
+msgstr[0] "{0} ano"
 msgstr[1] "{0} anos"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1403
@@ -95,16 +95,16 @@ msgstr "n/a"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
-msgstr[0] "1 ns"
+msgstr[0] "{0,number,####} ns"
 msgstr[1] "{0,number,###} ns"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
-msgstr[0] "1 μs"
+msgstr[0] "{0,number,####} μs"
 msgstr[1] "{0,number,###} μs"
 
 #: ../java/src/net/i2p/util/LogWriter.java:161
diff --git a/core/locale/messages_ro.po b/core/locale/messages_ro.po
index 4d29714d30fe9183ea36f7cf5929b4d96c5d2e6d..64708812916912f9a630f345c11c61467a044f37 100644
--- a/core/locale/messages_ro.po
+++ b/core/locale/messages_ro.po
@@ -43,9 +43,9 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
-msgstr[0] " 1 ms"
+msgstr[0] " {0,number,####} ms"
 msgstr[1] "{0,number,####} ms"
 msgstr[2] "{0,number,####} ms"
 
@@ -54,7 +54,7 @@ msgstr[2] "{0,number,####} ms"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
 msgstr[0] "{0} sec"
 msgstr[1] "{0} sec"
@@ -65,9 +65,9 @@ msgstr[2] "{0} sec"
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
-msgstr[0] "1 min"
+msgstr[0] "{0} min"
 msgstr[1] "{0} min"
 msgstr[2] "{0} min"
 
@@ -76,9 +76,9 @@ msgstr[2] "{0} min"
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
-msgstr[0] "1 hour"
+msgstr[0] "{0} hour"
 msgstr[1] "{0} hours"
 msgstr[2] "{0} ore"
 
@@ -86,9 +86,9 @@ msgstr[2] "{0} ore"
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
-msgstr[0] "1 zi"
+msgstr[0] "{0} zi"
 msgstr[1] "{0} zile"
 msgstr[2] "{0} zile"
 
@@ -96,9 +96,9 @@ msgstr[2] "{0} zile"
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
-msgstr[0] "1 an"
+msgstr[0] "{0} an"
 msgstr[1] "{0} ani"
 msgstr[2] "{0}  ani"
 
@@ -109,17 +109,17 @@ msgstr "n/a"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
-msgstr[0] "1 ns"
+msgstr[0] "{0,number,####} ns"
 msgstr[1] "{0,number,###} ns"
 msgstr[2] "{0,number,###} de ns"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
-msgstr[0] "1 μs"
+msgstr[0] "{0,number,####} μs"
 msgstr[1] "{0,number,###} μs"
 msgstr[2] "{0,number,###} de μs"
 
diff --git a/core/locale/messages_ru.po b/core/locale/messages_ru.po
index 52d6e580aee8e5a2213cf7dfff1d8d58917dc3ef..cb6475c20b69e540a4acd9f05a5e8c58a7c94b98 100644
--- a/core/locale/messages_ru.po
+++ b/core/locale/messages_ru.po
@@ -70,7 +70,7 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
 msgstr[0] "{0,number,####} мс"
 msgstr[1] "{0,number,####} мс"
@@ -82,7 +82,7 @@ msgstr[3] "{0,number,####} мс"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
 msgstr[0] "{0} с."
 msgstr[1] "{0} с."
@@ -94,7 +94,7 @@ msgstr[3] "{0} с"
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
 msgstr[0] "{0} мин."
 msgstr[1] "{0} мин."
@@ -106,7 +106,7 @@ msgstr[3] "{0} мин."
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
 msgstr[0] "{0} час"
 msgstr[1] "{0} часа"
@@ -117,7 +117,7 @@ msgstr[3] "{0} часов"
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
 msgstr[0] "{0} день"
 msgstr[1] "{0} дня"
@@ -128,7 +128,7 @@ msgstr[3] "{0} дней"
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
 msgstr[0] "{0} год"
 msgstr[1] "{0} года"
@@ -142,7 +142,7 @@ msgstr "н/д"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
 msgstr[0] "{0,number,##} нс"
 msgstr[1] "{0,number,###} нс"
@@ -151,7 +151,7 @@ msgstr[3] "{0,number,###} нс"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
 msgstr[0] "{0,number,##} мкс"
 msgstr[1] "{0,number,###} мкс"
diff --git a/core/locale/messages_sv.po b/core/locale/messages_sv.po
index 2bf5c63982ee75f94952a4e82fe02e53942902e7..ccd5476d4fa68cfcaec4dc8876c029a6147a628b 100644
--- a/core/locale/messages_sv.po
+++ b/core/locale/messages_sv.po
@@ -48,9 +48,9 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
-msgstr[0] "1 ms"
+msgstr[0] "{0,number,####} ms"
 msgstr[1] "{0,number,####} ms"
 
 #. seconds
@@ -58,9 +58,9 @@ msgstr[1] "{0,number,####} ms"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
-msgstr[0] "1 sek"
+msgstr[0] "{0} sek"
 msgstr[1] "{0} sek"
 
 #. minutes
@@ -68,9 +68,9 @@ msgstr[1] "{0} sek"
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
-msgstr[0] "1 min"
+msgstr[0] "{0} min"
 msgstr[1] "{0} min"
 
 #. hours
@@ -78,27 +78,27 @@ msgstr[1] "{0} min"
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
-msgstr[0] "1 timme"
+msgstr[0] "{0} timme"
 msgstr[1] "{0} timmar"
 
 #. days
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
-msgstr[0] "1 dag"
+msgstr[0] "{0} dag"
 msgstr[1] "{0} dagar"
 
 #. years
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
-msgstr[0] "1 år"
+msgstr[0] "{0} år"
 msgstr[1] "{0} år"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1403
@@ -108,16 +108,16 @@ msgstr "n/a"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
-msgstr[0] "1 ns"
+msgstr[0] "{0,number,####} ns"
 msgstr[1] "{0,number,###} ns"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
-msgstr[0] "1 μs"
+msgstr[0] "{0,number,####} μs"
 msgstr[1] "{0,number,###} μs"
 
 #: ../java/src/net/i2p/util/LogWriter.java:161
diff --git a/core/locale/messages_tr.po b/core/locale/messages_tr.po
index 6f20aab27a02d80de6a3f8920d23b91ae60f7d9d..3a0a808ddbf09226b57c632ecee4b5af5815c465 100644
--- a/core/locale/messages_tr.po
+++ b/core/locale/messages_tr.po
@@ -37,7 +37,7 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
 msgstr[0] "{0,number,####} ms"
 msgstr[1] "{0,number,####} ms"
@@ -47,7 +47,7 @@ msgstr[1] "{0,number,####} ms"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
 msgstr[0] "{0} sn"
 msgstr[1] "{0} sn"
@@ -57,7 +57,7 @@ msgstr[1] "{0} sn"
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
 msgstr[0] "{0} dk"
 msgstr[1] "{0} dk"
@@ -67,7 +67,7 @@ msgstr[1] "{0} dk"
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
 msgstr[0] "{0} saat"
 msgstr[1] "{0} saat"
@@ -76,7 +76,7 @@ msgstr[1] "{0} saat"
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
 msgstr[0] "{0} gün"
 msgstr[1] "{0} gün"
@@ -85,7 +85,7 @@ msgstr[1] "{0} gün"
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
 msgstr[0] "{0} yıl"
 msgstr[1] "{0} yıl"
@@ -97,14 +97,14 @@ msgstr "kullanılamaz"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
 msgstr[0] "{0,number,####} ns"
 msgstr[1] "{0,number,####} ns"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
 msgstr[0] "{0,number,###} μs"
 msgstr[1] "{0,number,###} μs"
diff --git a/core/locale/messages_uk.po b/core/locale/messages_uk.po
index 24ccff9f68a5fca83d4d04e19da0d1cddbbe3323..1c13b12b5776f66420a63bfced2292e12365021a 100644
--- a/core/locale/messages_uk.po
+++ b/core/locale/messages_uk.po
@@ -52,7 +52,7 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
 msgstr[0] "{0,number,####} мс"
 msgstr[1] "{0,number,####} мс"
@@ -64,7 +64,7 @@ msgstr[3] "{0,number,####} мс"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
 msgstr[0] "{0} с."
 msgstr[1] "{0} с."
@@ -76,7 +76,7 @@ msgstr[3] "{0} с."
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
 msgstr[0] "{0} хв."
 msgstr[1] "{0} хв."
@@ -88,7 +88,7 @@ msgstr[3] "{0} хв."
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
 msgstr[0] "{0} година"
 msgstr[1] "{0} години"
@@ -99,7 +99,7 @@ msgstr[3] "{0} годин"
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
 msgstr[0] "{0} день"
 msgstr[1] "{0} днів"
@@ -110,7 +110,7 @@ msgstr[3] "{0} днів"
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
 msgstr[0] "{0} рік"
 msgstr[1] "{0} роки"
@@ -124,7 +124,7 @@ msgstr "немає даних"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
 msgstr[0] "{0,number,###} нс"
 msgstr[1] "{0,number,###} нс"
@@ -133,7 +133,7 @@ msgstr[3] "{0,number,###} нс"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
 msgstr[0] "{0,number,###} μс"
 msgstr[1] "{0,number,###} μс"
diff --git a/core/locale/messages_vi.po b/core/locale/messages_vi.po
index 62c8dd360880775b70b8f712870b187915db9443..a532a02ca3db031ba8938a19f2ae1a7d62dffde4 100644
--- a/core/locale/messages_vi.po
+++ b/core/locale/messages_vi.po
@@ -34,7 +34,7 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
 msgstr[0] "{0,number,####} phần nghìn giây"
 
@@ -43,7 +43,7 @@ msgstr[0] "{0,number,####} phần nghìn giây"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
 msgstr[0] "{0} giây"
 
@@ -52,7 +52,7 @@ msgstr[0] "{0} giây"
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
 msgstr[0] "{0} phút"
 
@@ -61,7 +61,7 @@ msgstr[0] "{0} phút"
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
 msgstr[0] "{0} giờ"
 
@@ -69,7 +69,7 @@ msgstr[0] "{0} giờ"
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
 msgstr[0] "{0} ngày"
 
@@ -77,7 +77,7 @@ msgstr[0] "{0} ngày"
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
 msgstr[0] ""
 
@@ -88,13 +88,13 @@ msgstr "chưa rõ"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
 msgstr[0] ""
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
 msgstr[0] ""
 
diff --git a/core/locale/messages_zh.po b/core/locale/messages_zh.po
index 2326f8d6ec7f1693b4a6f11e77935606e0ba3a58..4361d70ce1b37bca0ee8a782215c79cfeb8b2b56 100644
--- a/core/locale/messages_zh.po
+++ b/core/locale/messages_zh.po
@@ -50,7 +50,7 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
 msgstr[0] "{0,number,####} 毫秒"
 
@@ -59,7 +59,7 @@ msgstr[0] "{0,number,####} 毫秒"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
 msgstr[0] "{0} 秒"
 
@@ -68,7 +68,7 @@ msgstr[0] "{0} 秒"
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
 msgstr[0] "{0} 分"
 
@@ -77,7 +77,7 @@ msgstr[0] "{0} 分"
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
 msgstr[0] "{0} 小时"
 
@@ -85,7 +85,7 @@ msgstr[0] "{0} 小时"
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
 msgstr[0] "{0} 天"
 
@@ -93,7 +93,7 @@ msgstr[0] "{0} 天"
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
 msgstr[0] "{0} å¹´"
 
@@ -104,13 +104,13 @@ msgstr "n/a"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
 msgstr[0] "{0,number,###} 纳秒"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
 msgstr[0] "{0,number,###} 微秒"
 
diff --git a/core/locale/messages_zh_TW.po b/core/locale/messages_zh_TW.po
index aefe1aa92e5ee1234464563a2f6d3ef1873981b0..43a19c17d2dbad9241a82920ae3fee42f2f977f2 100644
--- a/core/locale/messages_zh_TW.po
+++ b/core/locale/messages_zh_TW.po
@@ -39,7 +39,7 @@ msgstr ""
 #: ../java/src/net/i2p/data/DataHelper.java:1383
 #: ../java/src/net/i2p/data/DataHelper.java:1436
 #, java-format
-msgid "1 ms"
+msgid "{0,number,####} ms"
 msgid_plural "{0,number,####} ms"
 msgstr[0] "{0,number,####} ms"
 
@@ -48,7 +48,7 @@ msgstr[0] "{0,number,####} ms"
 #: ../java/src/net/i2p/data/DataHelper.java:1387
 #: ../java/src/net/i2p/data/DataHelper.java:1438
 #, java-format
-msgid "1 sec"
+msgid "{0} sec"
 msgid_plural "{0} sec"
 msgstr[0] "{0} 秒"
 
@@ -57,7 +57,7 @@ msgstr[0] "{0} 秒"
 #: ../java/src/net/i2p/data/DataHelper.java:1391
 #: ../java/src/net/i2p/data/DataHelper.java:1440
 #, java-format
-msgid "1 min"
+msgid "{0} min"
 msgid_plural "{0} min"
 msgstr[0] "{0} 分"
 
@@ -66,7 +66,7 @@ msgstr[0] "{0} 分"
 #: ../java/src/net/i2p/data/DataHelper.java:1395
 #: ../java/src/net/i2p/data/DataHelper.java:1442
 #, java-format
-msgid "1 hour"
+msgid "{0} hour"
 msgid_plural "{0} hours"
 msgstr[0] "{0} 小時"
 
@@ -74,7 +74,7 @@ msgstr[0] "{0} 小時"
 #: ../java/src/net/i2p/data/DataHelper.java:1398
 #: ../java/src/net/i2p/data/DataHelper.java:1445
 #, java-format
-msgid "1 day"
+msgid "{0} day"
 msgid_plural "{0} days"
 msgstr[0] "{0} 天"
 
@@ -82,7 +82,7 @@ msgstr[0] "{0} 天"
 #: ../java/src/net/i2p/data/DataHelper.java:1401
 #: ../java/src/net/i2p/data/DataHelper.java:1448
 #, java-format
-msgid "1 year"
+msgid "{0} year"
 msgid_plural "{0} years"
 msgstr[0] "{0} å¹´"
 
@@ -93,13 +93,13 @@ msgstr "不可用"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1432
 #, java-format
-msgid "1 ns"
+msgid "{0,number,####} ns"
 msgid_plural "{0,number,###} ns"
 msgstr[0] "{0,number,###} ns"
 
 #: ../java/src/net/i2p/data/DataHelper.java:1434
 #, java-format
-msgid "1 μs"
+msgid "{0,number,####} μs"
 msgid_plural "{0,number,###} μs"
 msgstr[0] "{0,number,###} μs"
 
diff --git a/tests/scripts/checkpo.sh b/tests/scripts/checkpo.sh
index ccf5af82be2ad666ccb9e295671de44ceb599998..5f4e8c81c8ee5b2cc511363e6bd3a91f5fbc13e5 100755
--- a/tests/scripts/checkpo.sh
+++ b/tests/scripts/checkpo.sh
@@ -10,6 +10,7 @@
 cd `dirname $0`/../..
 
 DIRS="\
+  core/locale \
   apps/routerconsole/locale \
   apps/routerconsole/locale-news \
   apps/routerconsole/locale-countries \