diff --git a/apps/i2psnark/locale/messages_en.po b/apps/i2psnark/locale/messages_en.po
index e88100e853dbf907737b64e526208885e3f4c649..baacc32784e07517f7588543250fe6561abc3a0f 100644
--- a/apps/i2psnark/locale/messages_en.po
+++ b/apps/i2psnark/locale/messages_en.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: I2P i2psnark\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 18:28+0000\n"
+"POT-Creation-Date: 2011-06-11 08:22+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"
@@ -128,16 +128,16 @@ msgid "Cannot open \"{0}\""
msgstr ""
#. TODO - if the existing one is a magnet, delete it and add the metainfo instead?
-#: ../java/src/org/klomp/snark/SnarkManager.java:586
-#: ../java/src/org/klomp/snark/SnarkManager.java:661
-#: ../java/src/org/klomp/snark/SnarkManager.java:716
+#: ../java/src/org/klomp/snark/SnarkManager.java:589
+#: ../java/src/org/klomp/snark/SnarkManager.java:665
+#: ../java/src/org/klomp/snark/SnarkManager.java:720
#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1976
#, java-format
msgid "Torrent with this info hash is already running: {0}"
msgstr ""
#. addMessage(_("Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and DHT only.", info.getName()));
-#: ../java/src/org/klomp/snark/SnarkManager.java:593
+#: ../java/src/org/klomp/snark/SnarkManager.java:596
#, java-format
msgid ""
"Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers "
@@ -145,136 +145,141 @@ msgid ""
msgstr ""
#. addMessage(_("Warning - No I2P trackers in \"{0}\", and DHT and open trackers are disabled, you should enable open trackers or DHT before starting the torrent.", info.getName()));
-#: ../java/src/org/klomp/snark/SnarkManager.java:598
+#: ../java/src/org/klomp/snark/SnarkManager.java:601
#, java-format
msgid ""
"Warning - No I2P Trackers found in \"{0}\". Make sure Open Tracker is "
"enabled before starting this torrent."
msgstr ""
-#: ../java/src/org/klomp/snark/SnarkManager.java:619
+#: ../java/src/org/klomp/snark/SnarkManager.java:622
#, java-format
msgid "Torrent in \"{0}\" is invalid"
msgstr ""
-#: ../java/src/org/klomp/snark/SnarkManager.java:624
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1999
+#: ../java/src/org/klomp/snark/SnarkManager.java:627
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1998
#, java-format
msgid "ERROR - Out of memory, cannot create torrent from {0}"
msgstr ""
-#: ../java/src/org/klomp/snark/SnarkManager.java:635
+#: ../java/src/org/klomp/snark/SnarkManager.java:639
#, java-format
msgid "Torrent added and started: \"{0}\""
msgstr ""
-#: ../java/src/org/klomp/snark/SnarkManager.java:637
+#: ../java/src/org/klomp/snark/SnarkManager.java:641
#, java-format
msgid "Torrent added: \"{0}\""
msgstr ""
-#: ../java/src/org/klomp/snark/SnarkManager.java:672
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
+#: ../java/src/org/klomp/snark/SnarkManager.java:676
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:491
#, java-format
msgid "Fetching {0}"
msgstr ""
-#: ../java/src/org/klomp/snark/SnarkManager.java:675
+#: ../java/src/org/klomp/snark/SnarkManager.java:679
#, java-format
msgid ""
"We have no saved peers and no other torrents are running. Fetch of {0} will "
"not succeed until you start another torrent."
msgstr ""
-#: ../java/src/org/klomp/snark/SnarkManager.java:679
+#: ../java/src/org/klomp/snark/SnarkManager.java:683
#, java-format
msgid "Adding {0}"
msgstr ""
-#: ../java/src/org/klomp/snark/SnarkManager.java:726
-#: ../java/src/org/klomp/snark/SnarkManager.java:749
-#: ../java/src/org/klomp/snark/SnarkManager.java:1174
+#: ../java/src/org/klomp/snark/SnarkManager.java:730
+#: ../java/src/org/klomp/snark/SnarkManager.java:753
+#: ../java/src/org/klomp/snark/SnarkManager.java:1180
#, java-format
msgid "Failed to copy torrent file to {0}"
msgstr ""
-#: ../java/src/org/klomp/snark/SnarkManager.java:972
+#: ../java/src/org/klomp/snark/SnarkManager.java:976
#, java-format
msgid "Too many files in \"{0}\" ({1}), deleting it!"
msgstr ""
-#: ../java/src/org/klomp/snark/SnarkManager.java:974
+#: ../java/src/org/klomp/snark/SnarkManager.java:978
#, java-format
msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
msgstr ""
-#: ../java/src/org/klomp/snark/SnarkManager.java:976
+#: ../java/src/org/klomp/snark/SnarkManager.java:980
#, java-format
msgid "No pieces in \"{0}\", deleting it!"
msgstr ""
-#: ../java/src/org/klomp/snark/SnarkManager.java:978
+#: ../java/src/org/klomp/snark/SnarkManager.java:982
#, java-format
msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
msgstr ""
-#: ../java/src/org/klomp/snark/SnarkManager.java:980
+#: ../java/src/org/klomp/snark/SnarkManager.java:984
#, java-format
msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
msgstr ""
-#: ../java/src/org/klomp/snark/SnarkManager.java:981
+#: ../java/src/org/klomp/snark/SnarkManager.java:985
#, java-format
msgid "Limit is {0}B"
msgstr ""
-#: ../java/src/org/klomp/snark/SnarkManager.java:989
+#: ../java/src/org/klomp/snark/SnarkManager.java:987
+#, java-format
+msgid "Torrent \"{0}\" has no data, deleting it!"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:995
#, java-format
msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
msgstr ""
-#: ../java/src/org/klomp/snark/SnarkManager.java:1005
+#: ../java/src/org/klomp/snark/SnarkManager.java:1011
#, java-format
msgid "Error: Could not remove the torrent {0}"
msgstr ""
-#: ../java/src/org/klomp/snark/SnarkManager.java:1026
-#: ../java/src/org/klomp/snark/SnarkManager.java:1044
+#: ../java/src/org/klomp/snark/SnarkManager.java:1032
+#: ../java/src/org/klomp/snark/SnarkManager.java:1050
#, java-format
msgid "Torrent stopped: \"{0}\""
msgstr ""
-#: ../java/src/org/klomp/snark/SnarkManager.java:1065
+#: ../java/src/org/klomp/snark/SnarkManager.java:1071
#, java-format
msgid "Torrent removed: \"{0}\""
msgstr ""
-#: ../java/src/org/klomp/snark/SnarkManager.java:1073
+#: ../java/src/org/klomp/snark/SnarkManager.java:1079
#, java-format
msgid "Adding torrents in {0}"
msgstr ""
-#: ../java/src/org/klomp/snark/SnarkManager.java:1122
+#: ../java/src/org/klomp/snark/SnarkManager.java:1128
#, java-format
msgid "Download finished: {0}"
msgstr ""
-#: ../java/src/org/klomp/snark/SnarkManager.java:1170
+#: ../java/src/org/klomp/snark/SnarkManager.java:1176
#, java-format
msgid "Metainfo received for {0}"
msgstr ""
-#: ../java/src/org/klomp/snark/SnarkManager.java:1171
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:525
+#: ../java/src/org/klomp/snark/SnarkManager.java:1177
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:526
#, java-format
msgid "Starting up torrent {0}"
msgstr ""
-#: ../java/src/org/klomp/snark/SnarkManager.java:1225
+#: ../java/src/org/klomp/snark/SnarkManager.java:1231
msgid "Unable to connect to I2P!"
msgstr ""
-#: ../java/src/org/klomp/snark/SnarkManager.java:1231
+#: ../java/src/org/klomp/snark/SnarkManager.java:1237
#, java-format
msgid "Unable to add {0}"
msgstr ""
@@ -365,79 +370,79 @@ msgstr ""
msgid "Up Rate"
msgstr ""
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:365
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:366
msgid "Stop all torrents and the I2P tunnel"
msgstr ""
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:367
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:368
msgid "Stop All"
msgstr ""
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:376
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:377
msgid "Start all torrents and the I2P tunnel"
msgstr ""
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:378
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:379
msgid "Start All"
msgstr ""
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:397
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:398
msgid "No torrents loaded."
msgstr ""
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:402
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:403
msgid "Totals"
msgstr ""
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:404
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:405
#, java-format
msgid "1 torrent"
msgid_plural "{0} torrents"
msgstr[0] ""
msgstr[1] ""
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:407
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:408
#, java-format
msgid "1 connected peer"
msgid_plural "{0} connected peers"
msgstr[0] ""
msgstr[1] ""
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:496
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:497
#, java-format
msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\""
msgstr ""
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:544
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:571
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:545
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:572
#, java-format
msgid "Magnet deleted: {0}"
msgstr ""
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:552
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:577
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:553
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:578
#, java-format
msgid "Torrent file deleted: {0}"
msgstr ""
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:593
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:584
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:594
#, java-format
msgid "Data file deleted: {0}"
msgstr ""
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:585
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:586
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596
#, java-format
msgid "Data file could not be deleted: {0}"
msgstr ""
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:604
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:605
#, java-format
msgid "Data dir deleted: {0}"
msgstr ""
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:637
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:638
msgid "Error creating torrent - you must select a tracker"
msgstr ""
@@ -888,22 +893,22 @@ msgstr ""
msgid "Torrent fetched from {0}"
msgstr ""
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1989
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1988
#, java-format
msgid "Torrent already running: {0}"
msgstr ""
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1991
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1990
#, java-format
msgid "Torrent already in the queue: {0}"
msgstr ""
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1997
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1996
#, java-format
msgid "Torrent at {0} was not valid"
msgstr ""
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2004
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2003
#, java-format
msgid "Torrent was not retrieved from {0}"
msgstr ""
diff --git a/apps/i2ptunnel/locale/messages_en.po b/apps/i2ptunnel/locale/messages_en.po
index 8cfb64f1017b01c9d35ac4adc2c6bf02e0522671..85be4041a3dae82a9f4e24ef7079eae0d0939f06 100644
--- a/apps/i2ptunnel/locale/messages_en.po
+++ b/apps/i2ptunnel/locale/messages_en.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: I2P i2ptunnel\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"POT-Creation-Date: 2011-06-11 08:23+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"
@@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:474
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:514
#, java-format
msgid ""
"To visit the destination in your host database, click <a href=\"{0}\">here</"
@@ -26,11 +26,83 @@ msgid ""
"\"{1}\">here</a>."
msgstr ""
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:931
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:875
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:388
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:142
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:401
+msgid "Host"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:876
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:370
+msgid "Destination"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:881
+#, java-format
+msgid "Continue to {0} without saving"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:886
+#, java-format
+msgid "Save {0} to router address book and continue to eepsite"
+msgstr ""
+
+#. only blockfile supports multiple books
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:889
+#, java-format
+msgid "Save {0} to master address book and continue to eepsite"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:890
+#, java-format
+msgid "Save {0} to private address book and continue to eepsite"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1046
msgid ""
"Click a link below to look for an address helper by using a \"jump\" service:"
msgstr ""
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1262
+msgid "Added via address helper"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1286
+#, java-format
+msgid "Redirecting to {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1292
+msgid "Router Console"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1293
+msgid "Addressbook"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1293
+msgid "Configuration"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1293
+msgid "Help"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1298
+#, java-format
+msgid "Saved {0} to the {1} addressbook, redirecting now."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1299
+#, java-format
+msgid "Failed to save {0} to the {1} addressbook, redirecting now."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1301
+msgid "Click here if you are not redirected automatically."
+msgstr ""
+
#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:326
#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:336
msgid "internal"
@@ -117,12 +189,12 @@ msgid "HTTP bidir"
msgstr ""
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:290
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:293
msgid "Host not set"
msgstr ""
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:521
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:272
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
msgid "Port not set"
msgstr ""
@@ -140,24 +212,24 @@ msgstr ""
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:112
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:112
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:107
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:121
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:242
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:110
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:124
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:245
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:260
msgid "Name"
msgstr ""
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:116
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:116
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:246
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:279
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:249
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:282
msgid "Type"
msgstr ""
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:120
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:120
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:226
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:389
msgid "Description"
msgstr ""
@@ -392,17 +464,11 @@ msgstr ""
msgid "Router I2CP Address"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:388
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:142
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:401
-msgid "Host"
-msgstr ""
-
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:396
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:148
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:409
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:244
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:247
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:269
msgid "Port"
msgstr ""
@@ -650,131 +716,127 @@ msgstr ""
msgid "Modify"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:71
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:74
msgid "I2P Tunnel Manager - List"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:83
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:86
msgid "Status Messages"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:87
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:90
msgid "Refresh"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:91
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:94
msgid "Stop All"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:95
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:98
msgid "Start All"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:102
msgid "Restart All"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:103
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:106
msgid "Reload Config"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:105
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:108
msgid "I2P Server Tunnels"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:109
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:112
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:133
msgid "Points at"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:111
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:153
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:157
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:114
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:156
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:160
msgid "Preview"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:113
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:177
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:250
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:297
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:116
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:253
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:300
msgid "Status"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:163
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:166
msgid "Base32 Address"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:171
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:174
msgid "No Preview"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:184
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:304
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:187
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:307
msgid "Starting..."
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:191
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:205
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:311
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:325
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:339
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:194
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:342
msgid "Stop"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:198
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:332
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:201
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:335
msgid "Running"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:212
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:346
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:215
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:349
msgid "Stopped"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:219
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:353
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:356
msgid "Start"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:234
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:237
msgid "New server tunnel"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:236
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:396
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:399
msgid "Standard"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:238
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:398
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:241
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:401
msgid "Create"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:240
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:243
msgid "I2P Client Tunnels"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:248
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:251
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:286
msgid "Interface"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:321
msgid "Standby"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:363
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:366
msgid "Outproxy"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:367
-msgid "Destination"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:381
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:384
msgid "none"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:394
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:397
msgid "New client tunnel"
msgstr ""
diff --git a/apps/routerconsole/locale/messages_en.po b/apps/routerconsole/locale/messages_en.po
index 3da36a223a3987eecc682a38d90b0b41d753da18..3e2de97ab20877223f4bf70fcd100e54b41b4825 100644
--- a/apps/routerconsole/locale/messages_en.po
+++ b/apps/routerconsole/locale/messages_en.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: I2P routerconsole\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-21 18:01+0000\n"
+"POT-Creation-Date: 2011-06-11 08:22+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"
@@ -26,7 +26,7 @@ msgstr ""
#. {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
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1141
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1192
#, java-format
msgid "1 ms"
msgid_plural "{0,number,####} ms"
@@ -36,7 +36,7 @@ msgstr[1] ""
#. seconds
#. Note to translators: quantity will always be greater than one.
#. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1146
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1197
#, java-format
msgid "1 sec"
msgid_plural "{0} sec"
@@ -46,7 +46,7 @@ msgstr[1] ""
#. minutes
#. Note to translators: quantity will always be greater than one.
#. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1151
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1202
#, java-format
msgid "1 min"
msgid_plural "{0} min"
@@ -56,21 +56,21 @@ msgstr[1] ""
#. hours
#. Note to translators: quantity will always be greater than one.
#. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1156
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1207
#, java-format
msgid "1 hour"
msgid_plural "{0} hours"
msgstr[0] ""
msgstr[1] ""
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1158
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1209
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:314
msgid "n/a"
msgstr ""
#. days
#. Note to translators: quantity will always be greater than one.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1162
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1213
#, java-format
msgid "1 day"
msgid_plural "{0} days"
@@ -96,6 +96,33 @@ msgstr ""
msgid "IP banned by blocklist.txt entry {0}"
msgstr ""
+#. NOTE TO TRANSLATORS - each of these phrases is a description for a statistic
+#. to be displayed on /stats.jsp and in the graphs on /graphs.jsp.
+#. Please keep relatively short so it will fit on the graphs.
+#: ../../../router/java/src/net/i2p/router/Router.java:1452
+msgid "Message receive rate (bytes/sec)"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/Router.java:1453
+msgid "Message send rate (bytes/sec)"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/Router.java:1454
+msgid "Low-level send rate (bytes/sec)"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/Router.java:1455
+msgid "Low-level receive rate (bytes/sec)"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/Router.java:1456
+msgid "How many peers we are actively talking with"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/Router.java:1459
+msgid "Known fast peers"
+msgstr ""
+
#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:92
msgid "Rejecting tunnels: Shutting down"
msgstr ""
@@ -225,7 +252,7 @@ msgid "Definitions"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:524
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:735
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:737
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1890
#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:24
#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:33
@@ -241,7 +268,7 @@ msgid "The remote peer, identified by router hash"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:525
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:736
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:738
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1894
msgid "Dir"
msgstr ""
@@ -267,13 +294,13 @@ msgid "How long since a packet has been received / sent"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:533
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:737
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:739
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1895
msgid "Idle"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:534
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:738
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:740
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1900
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:156
msgid "In/Out"
@@ -288,13 +315,13 @@ msgid "How long ago this connection was established"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:535
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:739
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:741
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1905
msgid "Up"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:536
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:740
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:742
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1907
msgid "Skew"
msgstr ""
@@ -349,7 +376,7 @@ msgid ""
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:546
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:741
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:743
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1924
msgid "TX"
msgstr ""
@@ -359,7 +386,7 @@ msgid "The total number of packets sent to the peer"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:547
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:742
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:744
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1926
msgid "RX"
msgstr ""
@@ -386,48 +413,164 @@ msgstr ""
msgid "The total number of duplicate packets received from the peer"
msgstr ""
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:402
+#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18
+msgid "Service"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:404
+msgid "WAN Common Interface Configuration"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:405
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:411
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:421
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:426
+#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:86
+msgid "Status"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:406
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:412
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:422
+msgid "Type"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:407
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:413
+msgid "Upstream"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:408
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:414
+msgid "Downstream"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:410
+msgid "WAN PPP Connection"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:415
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:423
+msgid "External IP"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:417
+msgid "Layer 3 Forwarding"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:418
+msgid "Default Connection Service"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:420
+msgid "WAN IP Connection"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:425
+msgid "WAN Ethernet Link Configuration"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:438
+msgid "Found Device"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:440
+msgid "Subdevice"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:461
+msgid "UPnP Status"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:464
+msgid ""
+"UPnP has been disabled; Do you have more than one UPnP Internet Gateway "
+"Device on your LAN ?"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:467
+msgid "UPnP has not found any UPnP-aware, compatible device on your LAN."
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:475
+#, java-format
+msgid "The current external IP address reported by UPnP is {0}"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:477
+msgid "The current external IP address is not available."
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:481
+#, java-format
+msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec"
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:483
+#, java-format
+msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec"
+msgstr ""
+
+#. {0} is TCP or UDP
+#. {1,number,#####} prevents 12345 from being output as 12,345 in the English locale.
+#. If you want the digit separator in your locale, translate as {1}.
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:492
+#, java-format
+msgid "{0} port {1,number,#####} was successfully forwarded by UPnP."
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:494
+#, java-format
+msgid "{0} port {1,number,#####} was not forwarded by UPnP."
+msgstr ""
+
+#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:161
+msgid "UPnP is not enabled"
+msgstr ""
+
#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:409
#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:627
#, java-format
msgid "Excessive clock skew: {0}"
msgstr ""
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:730
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:732
msgid "NTCP connections"
msgstr ""
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:731
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:733
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1886
msgid "Limit"
msgstr ""
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:732
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:734
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1887
msgid "Timeout"
msgstr ""
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:743
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:745
msgid "Out Queue"
msgstr ""
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:744
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:746
msgid "Backlogged?"
msgstr ""
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:758
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:760
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1949
#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:87
msgid "Inbound"
msgstr ""
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:760
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:762
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1951
#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:87
msgid "Outbound"
msgstr ""
#. buf.append("<tr> <td colspan=\"11\"><hr></td></tr>\n");
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:807
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:809
msgid "peers"
msgstr ""
@@ -543,950 +686,978 @@ msgid "Dropping tunnel requests: Too slow"
msgstr ""
#. don't even bother, since we are so overloaded locally
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:267
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:270
msgid "Dropping tunnel requests: Overloaded"
msgstr ""
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:470
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:473
msgid "Rejecting tunnels: Request overload"
msgstr ""
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:495
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:498
msgid "Rejecting tunnels: Connection limit"
msgstr ""
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:695
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:716
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:698
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:719
msgid "Dropping tunnel requests: High load"
msgstr ""
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:708
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:711
msgid "Dropping tunnel requests: Queue time"
msgstr ""
#. Automatically generated pseudo-java for xgettext - do not edit
#. Translators may wish to translate a few of these, do not bother to translate all of them!!
#: ../java/build/Countries.java:3
-msgid "Andorra"
+msgid "Anonymous Proxy"
msgstr ""
#: ../java/build/Countries.java:4
-msgid "United Arab Emirates"
+msgid "Satellite Provider"
msgstr ""
#: ../java/build/Countries.java:5
-msgid "Afghanistan"
+msgid "Andorra"
msgstr ""
#: ../java/build/Countries.java:6
-msgid "Antigua and Barbuda"
+msgid "United Arab Emirates"
msgstr ""
#: ../java/build/Countries.java:7
-msgid "Anguilla"
+msgid "Afghanistan"
msgstr ""
#: ../java/build/Countries.java:8
-msgid "Albania"
+msgid "Antigua and Barbuda"
msgstr ""
#: ../java/build/Countries.java:9
-msgid "Armenia"
+msgid "Anguilla"
msgstr ""
#: ../java/build/Countries.java:10
-msgid "Netherlands Antilles"
+msgid "Albania"
msgstr ""
#: ../java/build/Countries.java:11
-msgid "Angola"
+msgid "Armenia"
msgstr ""
#: ../java/build/Countries.java:12
-msgid "Antarctica"
+msgid "Netherlands Antilles"
msgstr ""
#: ../java/build/Countries.java:13
-msgid "Argentina"
+msgid "Angola"
msgstr ""
#: ../java/build/Countries.java:14
-msgid "American Samoa"
+msgid "Antarctica"
msgstr ""
#: ../java/build/Countries.java:15
-msgid "Austria"
+msgid "Argentina"
msgstr ""
#: ../java/build/Countries.java:16
-msgid "Australia"
+msgid "American Samoa"
msgstr ""
#: ../java/build/Countries.java:17
-msgid "Aruba"
+msgid "Austria"
+msgstr ""
+
+#: ../java/build/Countries.java:18
+msgid "Australia"
msgstr ""
#: ../java/build/Countries.java:19
-msgid "Azerbaijan"
+msgid "Aruba"
msgstr ""
#: ../java/build/Countries.java:20
-msgid "Bosnia and Herzegovina"
+msgid "Ã…land Islands"
msgstr ""
#: ../java/build/Countries.java:21
-msgid "Barbados"
+msgid "Azerbaijan"
msgstr ""
#: ../java/build/Countries.java:22
-msgid "Bangladesh"
+msgid "Bosnia and Herzegovina"
msgstr ""
#: ../java/build/Countries.java:23
-msgid "Belgium"
+msgid "Barbados"
msgstr ""
#: ../java/build/Countries.java:24
-msgid "Burkina Faso"
+msgid "Bangladesh"
msgstr ""
#: ../java/build/Countries.java:25
-msgid "Bulgaria"
+msgid "Belgium"
msgstr ""
#: ../java/build/Countries.java:26
-msgid "Bahrain"
+msgid "Burkina Faso"
msgstr ""
#: ../java/build/Countries.java:27
-msgid "Burundi"
+msgid "Bulgaria"
msgstr ""
#: ../java/build/Countries.java:28
-msgid "Benin"
+msgid "Bahrain"
msgstr ""
#: ../java/build/Countries.java:29
-msgid "Bermuda"
+msgid "Burundi"
msgstr ""
#: ../java/build/Countries.java:30
-msgid "Brunei Darussalam"
+msgid "Benin"
msgstr ""
#: ../java/build/Countries.java:31
-msgid "Bolivia"
+msgid "Bermuda"
msgstr ""
#: ../java/build/Countries.java:32
-msgid "Brazil"
+msgid "Brunei Darussalam"
msgstr ""
#: ../java/build/Countries.java:33
-msgid "Bahamas"
+msgid "Bolivia"
msgstr ""
#: ../java/build/Countries.java:34
-msgid "Bhutan"
+msgid "Brazil"
msgstr ""
#: ../java/build/Countries.java:35
-msgid "Bouvet Island"
+msgid "Bahamas"
msgstr ""
#: ../java/build/Countries.java:36
-msgid "Botswana"
+msgid "Bhutan"
msgstr ""
#: ../java/build/Countries.java:37
-msgid "Belarus"
+msgid "Bouvet Island"
msgstr ""
#: ../java/build/Countries.java:38
-msgid "Belize"
+msgid "Botswana"
msgstr ""
#: ../java/build/Countries.java:39
-msgid "Canada"
+msgid "Belarus"
msgstr ""
#: ../java/build/Countries.java:40
-msgid "The Democratic Republic of the Congo"
+msgid "Belize"
msgstr ""
#: ../java/build/Countries.java:41
-msgid "Central African Republic"
+msgid "Canada"
msgstr ""
#: ../java/build/Countries.java:42
-msgid "Congo"
+msgid "The Democratic Republic of the Congo"
msgstr ""
#: ../java/build/Countries.java:43
-msgid "Switzerland"
+msgid "Central African Republic"
msgstr ""
#: ../java/build/Countries.java:44
-msgid "Cote D'Ivoire"
+msgid "Congo"
msgstr ""
#: ../java/build/Countries.java:45
-msgid "Cook Islands"
+msgid "Switzerland"
msgstr ""
#: ../java/build/Countries.java:46
-msgid "Chile"
+msgid "Cote D'Ivoire"
msgstr ""
#: ../java/build/Countries.java:47
-msgid "Cameroon"
+msgid "Cook Islands"
msgstr ""
#: ../java/build/Countries.java:48
-msgid "China"
+msgid "Chile"
msgstr ""
#: ../java/build/Countries.java:49
-msgid "Colombia"
+msgid "Cameroon"
msgstr ""
#: ../java/build/Countries.java:50
-msgid "Costa Rica"
+msgid "China"
msgstr ""
#: ../java/build/Countries.java:51
-msgid "Serbia and Montenegro"
+msgid "Colombia"
msgstr ""
#: ../java/build/Countries.java:52
-msgid "Cuba"
+msgid "Costa Rica"
msgstr ""
#: ../java/build/Countries.java:53
-msgid "Cape Verde"
+msgid "Serbia and Montenegro"
msgstr ""
#: ../java/build/Countries.java:54
-msgid "Cyprus"
+msgid "Cuba"
msgstr ""
#: ../java/build/Countries.java:55
-msgid "Czech Republic"
+msgid "Cape Verde"
msgstr ""
#: ../java/build/Countries.java:56
-msgid "Germany"
+msgid "Cyprus"
msgstr ""
#: ../java/build/Countries.java:57
-msgid "Djibouti"
+msgid "Czech Republic"
msgstr ""
#: ../java/build/Countries.java:58
-msgid "Denmark"
+msgid "Germany"
msgstr ""
#: ../java/build/Countries.java:59
-msgid "Dominica"
+msgid "Djibouti"
msgstr ""
#: ../java/build/Countries.java:60
-msgid "Dominican Republic"
+msgid "Denmark"
msgstr ""
#: ../java/build/Countries.java:61
-msgid "Algeria"
+msgid "Dominica"
msgstr ""
#: ../java/build/Countries.java:62
-msgid "Ecuador"
+msgid "Dominican Republic"
msgstr ""
#: ../java/build/Countries.java:63
-msgid "Estonia"
+msgid "Algeria"
msgstr ""
#: ../java/build/Countries.java:64
-msgid "Egypt"
+msgid "Ecuador"
msgstr ""
#: ../java/build/Countries.java:65
-msgid "Eritrea"
+msgid "Estonia"
msgstr ""
#: ../java/build/Countries.java:66
-msgid "Spain"
+msgid "Egypt"
msgstr ""
#: ../java/build/Countries.java:67
-msgid "Ethiopia"
+msgid "Eritrea"
msgstr ""
#: ../java/build/Countries.java:68
-msgid "Finland"
+msgid "Spain"
msgstr ""
#: ../java/build/Countries.java:69
-msgid "Fiji"
+msgid "Ethiopia"
msgstr ""
#: ../java/build/Countries.java:70
-msgid "Falkland Islands (Malvinas)"
+msgid "Finland"
msgstr ""
#: ../java/build/Countries.java:71
-msgid "Federated States of Micronesia"
+msgid "Fiji"
msgstr ""
#: ../java/build/Countries.java:72
-msgid "Faroe Islands"
+msgid "Falkland Islands (Malvinas)"
msgstr ""
#: ../java/build/Countries.java:73
-msgid "France"
+msgid "Federated States of Micronesia"
msgstr ""
#: ../java/build/Countries.java:74
-msgid "Gabon"
+msgid "Faroe Islands"
msgstr ""
#: ../java/build/Countries.java:75
-msgid "United Kingdom"
+msgid "France"
msgstr ""
#: ../java/build/Countries.java:76
-msgid "Grenada"
+msgid "Gabon"
msgstr ""
#: ../java/build/Countries.java:77
-msgid "Georgia"
+msgid "United Kingdom"
msgstr ""
#: ../java/build/Countries.java:78
-msgid "French Guiana"
+msgid "Grenada"
msgstr ""
#: ../java/build/Countries.java:79
-msgid "Ghana"
+msgid "Georgia"
msgstr ""
#: ../java/build/Countries.java:80
-msgid "Gibraltar"
+msgid "French Guiana"
msgstr ""
#: ../java/build/Countries.java:81
-msgid "Greenland"
+msgid "Ghana"
msgstr ""
#: ../java/build/Countries.java:82
-msgid "Gambia"
+msgid "Gibraltar"
msgstr ""
#: ../java/build/Countries.java:83
-msgid "Guinea"
+msgid "Greenland"
msgstr ""
#: ../java/build/Countries.java:84
-msgid "Guadeloupe"
+msgid "Gambia"
msgstr ""
#: ../java/build/Countries.java:85
-msgid "Equatorial Guinea"
+msgid "Guinea"
msgstr ""
#: ../java/build/Countries.java:86
-msgid "Greece"
+msgid "Guadeloupe"
msgstr ""
#: ../java/build/Countries.java:87
-msgid "South Georgia and the South Sandwich Islands"
+msgid "Equatorial Guinea"
msgstr ""
#: ../java/build/Countries.java:88
-msgid "Guatemala"
+msgid "Greece"
msgstr ""
#: ../java/build/Countries.java:89
-msgid "Guam"
+msgid "South Georgia and the South Sandwich Islands"
msgstr ""
#: ../java/build/Countries.java:90
-msgid "Guinea-Bissau"
+msgid "Guatemala"
msgstr ""
#: ../java/build/Countries.java:91
-msgid "Guyana"
+msgid "Guam"
msgstr ""
#: ../java/build/Countries.java:92
-msgid "Hong Kong"
+msgid "Guinea-Bissau"
msgstr ""
#: ../java/build/Countries.java:93
-msgid "Honduras"
+msgid "Guyana"
msgstr ""
#: ../java/build/Countries.java:94
-msgid "Croatia"
+msgid "Hong Kong"
msgstr ""
#: ../java/build/Countries.java:95
-msgid "Haiti"
+msgid "Honduras"
msgstr ""
#: ../java/build/Countries.java:96
-msgid "Hungary"
+msgid "Croatia"
msgstr ""
#: ../java/build/Countries.java:97
-msgid "Indonesia"
+msgid "Haiti"
msgstr ""
#: ../java/build/Countries.java:98
-msgid "Ireland"
+msgid "Hungary"
msgstr ""
#: ../java/build/Countries.java:99
-msgid "Israel"
+msgid "Indonesia"
+msgstr ""
+
+#: ../java/build/Countries.java:100
+msgid "Ireland"
msgstr ""
#: ../java/build/Countries.java:101
-msgid "India"
+msgid "Israel"
msgstr ""
#: ../java/build/Countries.java:102
-msgid "British Indian Ocean Territory"
+msgid "Isle of Man"
msgstr ""
#: ../java/build/Countries.java:103
-msgid "Iraq"
+msgid "India"
msgstr ""
#: ../java/build/Countries.java:104
-msgid "Islamic Republic of Iran"
+msgid "British Indian Ocean Territory"
msgstr ""
#: ../java/build/Countries.java:105
-msgid "Iceland"
+msgid "Iraq"
msgstr ""
#: ../java/build/Countries.java:106
-msgid "Italy"
+msgid "Islamic Republic of Iran"
+msgstr ""
+
+#: ../java/build/Countries.java:107
+msgid "Iceland"
msgstr ""
#: ../java/build/Countries.java:108
-msgid "Jamaica"
+msgid "Italy"
msgstr ""
#: ../java/build/Countries.java:109
-msgid "Jordan"
+msgid "Jersey"
msgstr ""
#: ../java/build/Countries.java:110
-msgid "Japan"
+msgid "Jamaica"
msgstr ""
#: ../java/build/Countries.java:111
-msgid "Kenya"
+msgid "Jordan"
msgstr ""
#: ../java/build/Countries.java:112
-msgid "Kyrgyzstan"
+msgid "Japan"
msgstr ""
#: ../java/build/Countries.java:113
-msgid "Cambodia"
+msgid "Kenya"
msgstr ""
#: ../java/build/Countries.java:114
-msgid "Kiribati"
+msgid "Kyrgyzstan"
msgstr ""
#: ../java/build/Countries.java:115
-msgid "Comoros"
+msgid "Cambodia"
msgstr ""
#: ../java/build/Countries.java:116
-msgid "Saint Kitts and Nevis"
+msgid "Kiribati"
msgstr ""
#: ../java/build/Countries.java:117
-msgid "Republic of Korea"
+msgid "Comoros"
msgstr ""
#: ../java/build/Countries.java:118
-msgid "Kuwait"
+msgid "Saint Kitts and Nevis"
msgstr ""
#: ../java/build/Countries.java:119
-msgid "Cayman Islands"
+msgid "Republic of Korea"
msgstr ""
#: ../java/build/Countries.java:120
-msgid "Kazakhstan"
+msgid "Kuwait"
msgstr ""
#: ../java/build/Countries.java:121
-msgid "Lao People's Democratic Republic"
+msgid "Cayman Islands"
msgstr ""
#: ../java/build/Countries.java:122
-msgid "Lebanon"
+msgid "Kazakhstan"
msgstr ""
#: ../java/build/Countries.java:123
-msgid "Saint Lucia"
+msgid "Lao People's Democratic Republic"
msgstr ""
#: ../java/build/Countries.java:124
-msgid "Liechtenstein"
+msgid "Lebanon"
msgstr ""
#: ../java/build/Countries.java:125
-msgid "Sri Lanka"
+msgid "Saint Lucia"
msgstr ""
#: ../java/build/Countries.java:126
-msgid "Liberia"
+msgid "Liechtenstein"
msgstr ""
#: ../java/build/Countries.java:127
-msgid "Lesotho"
+msgid "Sri Lanka"
msgstr ""
#: ../java/build/Countries.java:128
-msgid "Lithuania"
+msgid "Liberia"
msgstr ""
#: ../java/build/Countries.java:129
-msgid "Luxembourg"
+msgid "Lesotho"
msgstr ""
#: ../java/build/Countries.java:130
-msgid "Latvia"
+msgid "Lithuania"
msgstr ""
#: ../java/build/Countries.java:131
-msgid "Libyan Arab Jamahiriya"
+msgid "Luxembourg"
msgstr ""
#: ../java/build/Countries.java:132
-msgid "Morocco"
+msgid "Latvia"
msgstr ""
#: ../java/build/Countries.java:133
-msgid "Monaco"
+msgid "Libyan Arab Jamahiriya"
msgstr ""
#: ../java/build/Countries.java:134
+msgid "Morocco"
+msgstr ""
+
+#: ../java/build/Countries.java:135
+msgid "Monaco"
+msgstr ""
+
+#: ../java/build/Countries.java:136
msgid "Republic of Moldova"
msgstr ""
#: ../java/build/Countries.java:137
-msgid "Madagascar"
+msgid "Montenegro"
msgstr ""
#: ../java/build/Countries.java:138
-msgid "Marshall Islands"
+msgid "Saint Martin"
msgstr ""
#: ../java/build/Countries.java:139
-msgid "The Former Yugoslav Republic of Macedonia"
+msgid "Madagascar"
msgstr ""
#: ../java/build/Countries.java:140
-msgid "Mali"
+msgid "Marshall Islands"
msgstr ""
#: ../java/build/Countries.java:141
-msgid "Myanmar"
+msgid "The Former Yugoslav Republic of Macedonia"
msgstr ""
#: ../java/build/Countries.java:142
-msgid "Mongolia"
+msgid "Mali"
msgstr ""
#: ../java/build/Countries.java:143
-msgid "Macao"
+msgid "Myanmar"
msgstr ""
#: ../java/build/Countries.java:144
-msgid "Northern Mariana Islands"
+msgid "Mongolia"
msgstr ""
#: ../java/build/Countries.java:145
-msgid "Martinique"
+msgid "Macao"
msgstr ""
#: ../java/build/Countries.java:146
-msgid "Mauritania"
+msgid "Northern Mariana Islands"
msgstr ""
#: ../java/build/Countries.java:147
-msgid "Montserrat"
+msgid "Martinique"
msgstr ""
#: ../java/build/Countries.java:148
-msgid "Malta"
+msgid "Mauritania"
msgstr ""
#: ../java/build/Countries.java:149
-msgid "Mauritius"
+msgid "Montserrat"
msgstr ""
#: ../java/build/Countries.java:150
-msgid "Maldives"
+msgid "Malta"
msgstr ""
#: ../java/build/Countries.java:151
-msgid "Malawi"
+msgid "Mauritius"
msgstr ""
#: ../java/build/Countries.java:152
+msgid "Maldives"
+msgstr ""
+
+#: ../java/build/Countries.java:153
+msgid "Malawi"
+msgstr ""
+
+#: ../java/build/Countries.java:154
msgid "Mexico"
msgstr ""
-#: ../java/build/Countries.java:153
+#: ../java/build/Countries.java:155
msgid "Malaysia"
msgstr ""
-#: ../java/build/Countries.java:154
+#: ../java/build/Countries.java:156
msgid "Mozambique"
msgstr ""
-#: ../java/build/Countries.java:155
+#: ../java/build/Countries.java:157
msgid "Namibia"
msgstr ""
-#: ../java/build/Countries.java:156
+#: ../java/build/Countries.java:158
msgid "New Caledonia"
msgstr ""
-#: ../java/build/Countries.java:157
+#: ../java/build/Countries.java:159
msgid "Niger"
msgstr ""
-#: ../java/build/Countries.java:158
+#: ../java/build/Countries.java:160
msgid "Norfolk Island"
msgstr ""
-#: ../java/build/Countries.java:159
+#: ../java/build/Countries.java:161
msgid "Nigeria"
msgstr ""
-#: ../java/build/Countries.java:160
+#: ../java/build/Countries.java:162
msgid "Nicaragua"
msgstr ""
-#: ../java/build/Countries.java:161
+#: ../java/build/Countries.java:163
msgid "Netherlands"
msgstr ""
-#: ../java/build/Countries.java:162
+#: ../java/build/Countries.java:164
msgid "Norway"
msgstr ""
-#: ../java/build/Countries.java:163
+#: ../java/build/Countries.java:165
msgid "Nepal"
msgstr ""
-#: ../java/build/Countries.java:164
+#: ../java/build/Countries.java:166
msgid "Nauru"
msgstr ""
-#: ../java/build/Countries.java:165
+#: ../java/build/Countries.java:167
msgid "Niue"
msgstr ""
-#: ../java/build/Countries.java:166
+#: ../java/build/Countries.java:168
msgid "New Zealand"
msgstr ""
-#: ../java/build/Countries.java:167
+#: ../java/build/Countries.java:169
msgid "Oman"
msgstr ""
-#: ../java/build/Countries.java:168
+#: ../java/build/Countries.java:170
msgid "Panama"
msgstr ""
-#: ../java/build/Countries.java:169
+#: ../java/build/Countries.java:171
msgid "Peru"
msgstr ""
-#: ../java/build/Countries.java:170
+#: ../java/build/Countries.java:172
msgid "French Polynesia"
msgstr ""
-#: ../java/build/Countries.java:171
+#: ../java/build/Countries.java:173
msgid "Papua New Guinea"
msgstr ""
-#: ../java/build/Countries.java:172
+#: ../java/build/Countries.java:174
msgid "Philippines"
msgstr ""
-#: ../java/build/Countries.java:173
+#: ../java/build/Countries.java:175
msgid "Pakistan"
msgstr ""
-#: ../java/build/Countries.java:174
+#: ../java/build/Countries.java:176
msgid "Poland"
msgstr ""
-#: ../java/build/Countries.java:175
+#: ../java/build/Countries.java:177
msgid "Saint Pierre and Miquelon"
msgstr ""
-#: ../java/build/Countries.java:176
+#: ../java/build/Countries.java:178
msgid "Puerto Rico"
msgstr ""
-#: ../java/build/Countries.java:177
+#: ../java/build/Countries.java:179
msgid "Palestinian Territory"
msgstr ""
-#: ../java/build/Countries.java:178
+#: ../java/build/Countries.java:180
msgid "Portugal"
msgstr ""
-#: ../java/build/Countries.java:179
+#: ../java/build/Countries.java:181
msgid "Palau"
msgstr ""
-#: ../java/build/Countries.java:180
+#: ../java/build/Countries.java:182
msgid "Paraguay"
msgstr ""
-#: ../java/build/Countries.java:181
+#: ../java/build/Countries.java:183
msgid "Qatar"
msgstr ""
-#: ../java/build/Countries.java:182
+#: ../java/build/Countries.java:184
msgid "Reunion"
msgstr ""
-#: ../java/build/Countries.java:183
+#: ../java/build/Countries.java:185
msgid "Romania"
msgstr ""
-#: ../java/build/Countries.java:184
+#: ../java/build/Countries.java:186
msgid "Serbia"
msgstr ""
-#: ../java/build/Countries.java:185
+#: ../java/build/Countries.java:187
msgid "Russian Federation"
msgstr ""
-#: ../java/build/Countries.java:186
+#: ../java/build/Countries.java:188
msgid "Rwanda"
msgstr ""
-#: ../java/build/Countries.java:187
+#: ../java/build/Countries.java:189
msgid "Saudi Arabia"
msgstr ""
-#: ../java/build/Countries.java:188
+#: ../java/build/Countries.java:190
msgid "Solomon Islands"
msgstr ""
-#: ../java/build/Countries.java:189
+#: ../java/build/Countries.java:191
msgid "Seychelles"
msgstr ""
-#: ../java/build/Countries.java:190
+#: ../java/build/Countries.java:192
msgid "Sudan"
msgstr ""
-#: ../java/build/Countries.java:191
+#: ../java/build/Countries.java:193
msgid "Sweden"
msgstr ""
-#: ../java/build/Countries.java:192
+#: ../java/build/Countries.java:194
msgid "Singapore"
msgstr ""
-#: ../java/build/Countries.java:193
+#: ../java/build/Countries.java:195
msgid "Slovenia"
msgstr ""
-#: ../java/build/Countries.java:194
+#: ../java/build/Countries.java:196
msgid "Slovakia"
msgstr ""
-#: ../java/build/Countries.java:195
+#: ../java/build/Countries.java:197
msgid "Sierra Leone"
msgstr ""
-#: ../java/build/Countries.java:196
+#: ../java/build/Countries.java:198
msgid "San Marino"
msgstr ""
-#: ../java/build/Countries.java:197
+#: ../java/build/Countries.java:199
msgid "Senegal"
msgstr ""
-#: ../java/build/Countries.java:198
+#: ../java/build/Countries.java:200
msgid "Somalia"
msgstr ""
-#: ../java/build/Countries.java:199
+#: ../java/build/Countries.java:201
msgid "Suriname"
msgstr ""
-#: ../java/build/Countries.java:200
+#: ../java/build/Countries.java:202
msgid "Sao Tome and Principe"
msgstr ""
-#: ../java/build/Countries.java:201
+#: ../java/build/Countries.java:203
msgid "El Salvador"
msgstr ""
-#: ../java/build/Countries.java:202
+#: ../java/build/Countries.java:204
msgid "Syrian Arab Republic"
msgstr ""
-#: ../java/build/Countries.java:203
+#: ../java/build/Countries.java:205
msgid "Swaziland"
msgstr ""
-#: ../java/build/Countries.java:204
+#: ../java/build/Countries.java:206
msgid "Turks and Caicos Islands"
msgstr ""
-#: ../java/build/Countries.java:205
+#: ../java/build/Countries.java:207
msgid "Chad"
msgstr ""
-#: ../java/build/Countries.java:206
+#: ../java/build/Countries.java:208
msgid "French Southern Territories"
msgstr ""
-#: ../java/build/Countries.java:207
+#: ../java/build/Countries.java:209
msgid "Togo"
msgstr ""
-#: ../java/build/Countries.java:208
+#: ../java/build/Countries.java:210
msgid "Thailand"
msgstr ""
-#: ../java/build/Countries.java:209
+#: ../java/build/Countries.java:211
msgid "Tajikistan"
msgstr ""
-#: ../java/build/Countries.java:210
+#: ../java/build/Countries.java:212
msgid "Tokelau"
msgstr ""
-#: ../java/build/Countries.java:211
+#: ../java/build/Countries.java:213
msgid "Timor-Leste"
msgstr ""
-#: ../java/build/Countries.java:212
+#: ../java/build/Countries.java:214
msgid "Turkmenistan"
msgstr ""
-#: ../java/build/Countries.java:213
+#: ../java/build/Countries.java:215
msgid "Tunisia"
msgstr ""
-#: ../java/build/Countries.java:214
+#: ../java/build/Countries.java:216
msgid "Tonga"
msgstr ""
-#: ../java/build/Countries.java:215
+#: ../java/build/Countries.java:217
msgid "Turkey"
msgstr ""
-#: ../java/build/Countries.java:216
+#: ../java/build/Countries.java:218
msgid "Trinidad and Tobago"
msgstr ""
-#: ../java/build/Countries.java:217
+#: ../java/build/Countries.java:219
msgid "Tuvalu"
msgstr ""
-#: ../java/build/Countries.java:218
+#: ../java/build/Countries.java:220
msgid "Taiwan"
msgstr ""
-#: ../java/build/Countries.java:219
+#: ../java/build/Countries.java:221
msgid "United Republic of Tanzania"
msgstr ""
-#: ../java/build/Countries.java:220
+#: ../java/build/Countries.java:222
msgid "Ukraine"
msgstr ""
-#: ../java/build/Countries.java:221
+#: ../java/build/Countries.java:223
msgid "Uganda"
msgstr ""
-#: ../java/build/Countries.java:222
+#: ../java/build/Countries.java:224
msgid "United States Minor Outlying Islands"
msgstr ""
-#: ../java/build/Countries.java:223
+#: ../java/build/Countries.java:225
msgid "United States"
msgstr ""
-#: ../java/build/Countries.java:224
+#: ../java/build/Countries.java:226
msgid "Uruguay"
msgstr ""
-#: ../java/build/Countries.java:225
+#: ../java/build/Countries.java:227
msgid "Uzbekistan"
msgstr ""
-#: ../java/build/Countries.java:226
+#: ../java/build/Countries.java:228
msgid "Holy See (Vatican City State)"
msgstr ""
-#: ../java/build/Countries.java:227
+#: ../java/build/Countries.java:229
msgid "Saint Vincent and the Grenadines"
msgstr ""
-#: ../java/build/Countries.java:228
+#: ../java/build/Countries.java:230
msgid "Venezuela"
msgstr ""
-#: ../java/build/Countries.java:229 ../java/build/Countries.java:230
+#: ../java/build/Countries.java:231 ../java/build/Countries.java:232
msgid "Virgin Islands"
msgstr ""
-#: ../java/build/Countries.java:231
+#: ../java/build/Countries.java:233
msgid "Viet Nam"
msgstr ""
-#: ../java/build/Countries.java:232
+#: ../java/build/Countries.java:234
msgid "Vanuatu"
msgstr ""
-#: ../java/build/Countries.java:233
+#: ../java/build/Countries.java:235
msgid "Wallis and Futuna"
msgstr ""
-#: ../java/build/Countries.java:234
+#: ../java/build/Countries.java:236
msgid "Samoa"
msgstr ""
-#: ../java/build/Countries.java:235
+#: ../java/build/Countries.java:237
msgid "Yemen"
msgstr ""
-#: ../java/build/Countries.java:236
+#: ../java/build/Countries.java:238
msgid "Mayotte"
msgstr ""
-#: ../java/build/Countries.java:237
+#: ../java/build/Countries.java:239
msgid "South Africa"
msgstr ""
-#: ../java/build/Countries.java:238
+#: ../java/build/Countries.java:240
msgid "Zambia"
msgstr ""
-#: ../java/build/Countries.java:239
+#: ../java/build/Countries.java:241
msgid "Zimbabwe"
msgstr ""
@@ -1550,125 +1721,134 @@ msgstr ""
msgid "Error deleting plugin {0}"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:101
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:109
#, java-format
msgid "Stopped plugin {0}"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:103
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:111
#, java-format
msgid "Error stopping plugin {0}"
msgstr ""
#. label (IE)
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:124
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:255
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:133
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:260
msgid "Start"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:143
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:152
#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:49
#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:61
#: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:33
msgid "Unsupported"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:189
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:198
msgid "New client added"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:193
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:202
msgid ""
"Client configuration saved successfully - restart required to take effect."
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:207
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:218
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:217
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:230
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:241
msgid "Bad client index."
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:212
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:223
+#.
+#. What do we do here?
+#.
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:224
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:235
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:246
#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:102
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:392
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394
#: ../java/src/net/i2p/router/web/SummaryHelper.java:384
msgid "Client"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:212
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:271
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:224
+msgid "stopped"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:235
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:294
msgid "started"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:223
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:246
msgid "deleted"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:240
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:263
msgid "WebApp configuration saved."
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:256
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:279
msgid "Plugin configuration saved."
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:271
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:124
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:294
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:129
msgid "WebApp"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:273
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:296
msgid "Failed to start"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:278
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:301
msgid "Failed to find server."
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:284
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:307
msgid "No plugin URL specified."
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:294
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:317
#, java-format
msgid "No update URL specified for {0}"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:302
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:307
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:320
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:325
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:330
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:343
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:348
msgid "Plugin or update download already in progress."
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:311
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:334
#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:118
#, java-format
msgid "Downloading plugin from {0}"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:329
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:352
#, java-format
msgid "Checking plugin {0} for updates"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:339
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:362
#, java-format
msgid "Started plugin {0}"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:341
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:364
#, java-format
msgid "Error starting plugin {0}"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:376
+#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:399
msgid ""
"Interface configuration saved successfully - restart required to take effect."
msgstr ""
#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:85
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:258
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:263
msgid "Edit"
msgstr ""
@@ -1682,78 +1862,78 @@ msgid "Class and arguments"
msgstr ""
#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:102
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:124
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:148
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:129
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:153
msgid "Control"
msgstr ""
#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:102
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:124
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:148
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:129
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:153
msgid "Run at Startup?"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:124
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:148
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:197
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:129
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:153
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:202
msgid "Description"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:148
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:153
msgid "Plugin"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:161
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:166
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:273
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:187
msgid "Version"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:168
msgid "Signed by"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:180
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:185
msgid "Date"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:186
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:191
msgid "Author"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:202
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:207
msgid "License"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:207
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:212
msgid "Website"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:212
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:217
msgid "Update link"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:260
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:265
msgid "Stop"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:262
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:78
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:267
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:79
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:331
msgid "Check for updates"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:263
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:268
#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18
msgid "Update"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:268
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:273
#, java-format
msgid "Are you sure you want to delete {0}?"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:270
+#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:275
msgid "Delete"
msgstr ""
@@ -1853,17 +2033,13 @@ msgid "Select a class to add"
msgstr ""
#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:204
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
msgid "Network"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18
-msgid "Service"
-msgstr ""
-
#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:101
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:383
#: ../java/strings/Strings.java:72
msgid "Tunnels"
msgstr ""
@@ -1887,14 +2063,14 @@ msgstr ""
#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:107
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:255
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:257
#: ../java/strings/Strings.java:67
msgid "Peers"
msgstr ""
#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:389
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:143
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145
msgid "Stats"
msgstr ""
@@ -2103,6 +2279,7 @@ msgstr ""
#. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns
#. give the UI time to respond
#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:43
+#: ../java/src/net/i2p/router/web/SummaryRenderer.java:134
msgid "Restart"
msgstr ""
@@ -2233,15 +2410,19 @@ msgstr ""
msgid "Warning: unable to remove the service"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:111
+#: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:113
msgid "Stat filter and location updated successfully to"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:113
-msgid "Failed to update the stat filter and location"
+#: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:116
+msgid "Full statistics enabled - restart required to take effect"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:118
+msgid "Full statistics disabled - restart required to take effect"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:114
+#: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:121
msgid ""
"Graph list updated, may take up to 60s to be reflected here and on the <a "
"href=\"graphs.jsp\">Graphs Page</a>"
@@ -2382,52 +2563,52 @@ msgstr ""
msgid "Swedish"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:85
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:86
msgid "Update available, attempting to download now"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:87
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:88
msgid "Update available, click button on left to download"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:93
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:94
msgid "No update available"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:101
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:103
msgid "Updating news URL to"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:109
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:111
msgid "Updating proxy host to"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:117
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:119
msgid "Updating proxy port to"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:130
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:132
msgid "Updating refresh frequency to"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:137
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:139
msgid "Updating update policy to"
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:146
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:148
msgid "Updating update URLs."
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:155
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:157
msgid "Updating trusted keys."
msgstr ""
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:163
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165
msgid "Updating unsigned update URL to"
msgstr ""
#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:88
-#: ../java/src/net/i2p/router/web/GraphHelper.java:167
+#: ../java/src/net/i2p/router/web/GraphHelper.java:188
msgid "Never"
msgstr ""
@@ -2453,68 +2634,77 @@ msgid ""
"button on your browser. Please resubmit."
msgstr ""
-#: ../java/src/net/i2p/router/web/GraphHelper.java:93
+#: ../java/src/net/i2p/router/web/GraphHelper.java:115
msgid "Combined bandwidth graph"
msgstr ""
#. e.g. "statname for 60m"
-#: ../java/src/net/i2p/router/web/GraphHelper.java:107
+#: ../java/src/net/i2p/router/web/GraphHelper.java:128
#, java-format
msgid "{0} for {1}"
msgstr ""
-#: ../java/src/net/i2p/router/web/GraphHelper.java:146
+#. FIXME jrobin doesn't support setting the timezone, will have to mod TimeAxis.java
+#: ../java/src/net/i2p/router/web/GraphHelper.java:150
+msgid "All times are UTC."
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:167
msgid "Configure Graph Display"
msgstr ""
-#: ../java/src/net/i2p/router/web/GraphHelper.java:146
+#: ../java/src/net/i2p/router/web/GraphHelper.java:167
msgid "Select Stats"
msgstr ""
-#: ../java/src/net/i2p/router/web/GraphHelper.java:150
+#: ../java/src/net/i2p/router/web/GraphHelper.java:171
msgid "Periods"
msgstr ""
-#: ../java/src/net/i2p/router/web/GraphHelper.java:151
+#: ../java/src/net/i2p/router/web/GraphHelper.java:172
msgid "Plot averages"
msgstr ""
-#: ../java/src/net/i2p/router/web/GraphHelper.java:152
+#: ../java/src/net/i2p/router/web/GraphHelper.java:173
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:435
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:351
msgid "or"
msgstr ""
-#: ../java/src/net/i2p/router/web/GraphHelper.java:152
+#: ../java/src/net/i2p/router/web/GraphHelper.java:173
msgid "plot events"
msgstr ""
-#: ../java/src/net/i2p/router/web/GraphHelper.java:153
+#: ../java/src/net/i2p/router/web/GraphHelper.java:174
msgid "Image sizes"
msgstr ""
-#: ../java/src/net/i2p/router/web/GraphHelper.java:153
+#: ../java/src/net/i2p/router/web/GraphHelper.java:174
msgid "width"
msgstr ""
-#: ../java/src/net/i2p/router/web/GraphHelper.java:154
+#: ../java/src/net/i2p/router/web/GraphHelper.java:175
msgid "height"
msgstr ""
-#: ../java/src/net/i2p/router/web/GraphHelper.java:154
-#: ../java/src/net/i2p/router/web/GraphHelper.java:155
+#: ../java/src/net/i2p/router/web/GraphHelper.java:175
+#: ../java/src/net/i2p/router/web/GraphHelper.java:176
msgid "pixels"
msgstr ""
-#: ../java/src/net/i2p/router/web/GraphHelper.java:156
+#: ../java/src/net/i2p/router/web/GraphHelper.java:177
msgid "Refresh delay"
msgstr ""
-#: ../java/src/net/i2p/router/web/GraphHelper.java:171
-msgid "Redraw"
+#: ../java/src/net/i2p/router/web/GraphHelper.java:192
+msgid "Store graph data on disk?"
msgstr ""
-#: ../java/src/net/i2p/router/web/GraphHelper.java:203
+#: ../java/src/net/i2p/router/web/GraphHelper.java:198
+msgid "Save settings and redraw graphs"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/GraphHelper.java:253
msgid "Graph settings saved"
msgstr ""
@@ -2531,69 +2721,69 @@ msgstr ""
msgid "No log messages"
msgstr ""
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:80
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:79
msgid "Network Database RouterInfo Lookup"
msgstr ""
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:95
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:94
#: ../java/strings/Strings.java:68
msgid "Router"
msgstr ""
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:95
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:94
msgid "not found in network database"
msgstr ""
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:107
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:106
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:215
msgid "Network Database Contents"
msgstr ""
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:108
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:107
msgid "View RouterInfo"
msgstr ""
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:109
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:108
msgid "LeaseSets"
msgstr ""
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:131
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:130
msgid "LeaseSet"
msgstr ""
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:133
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:132
msgid "Local"
msgstr ""
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:135
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:134
msgid "Unpublished"
msgstr ""
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:136
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:135
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:142
msgid "Destination"
msgstr ""
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:153
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:152
#, java-format
msgid "Expires in {0}"
msgstr ""
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:155
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:154
#, java-format
msgid "Expired {0} ago"
msgstr ""
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:167
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:166
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:156
msgid "Gateway"
msgstr ""
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:167
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:166
msgid "Lease"
msgstr ""
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:169
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
msgid "Tunnel"
msgstr ""
@@ -2701,12 +2891,12 @@ msgstr ""
msgid "NTCP and SSU with introducers"
msgstr ""
-#: ../java/src/net/i2p/router/web/NewsFetcher.java:92
+#: ../java/src/net/i2p/router/web/NewsFetcher.java:93
#, java-format
msgid "News last updated {0} ago."
msgstr ""
-#: ../java/src/net/i2p/router/web/NewsFetcher.java:98
+#: ../java/src/net/i2p/router/web/NewsFetcher.java:99
#, java-format
msgid "News last checked {0} ago."
msgstr ""
@@ -2919,10 +3109,6 @@ msgstr ""
msgid "Integration"
msgstr ""
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:86
-msgid "Status"
-msgstr ""
-
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:126
msgid "Fast, High Capacity"
msgstr ""
@@ -2941,7 +3127,7 @@ msgid "Failing"
msgstr ""
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:284
msgid "Integrated"
msgstr ""
@@ -3109,39 +3295,38 @@ msgstr ""
msgid "unban now"
msgstr ""
-#. Note to translators: all runtime zh translation disabled in this file, no font available in RRD
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:223
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:303
msgid "Bandwidth usage"
msgstr ""
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:230
-msgid "Outbound bytes/sec"
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:313
+msgid "Outbound Bytes/sec"
msgstr ""
#. def.line(sendName, Color.BLUE, "Outbound bytes/sec", 3);
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:232
-msgid "Inbound bytes/sec"
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:315
+msgid "Inbound Bytes/sec"
msgstr ""
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:235
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:236
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:237
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:238
-msgid "bytes/sec"
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:318
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:319
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:320
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:321
+msgid "Bps"
msgstr ""
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:235
-msgid "out average"
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:318
+msgid "Out average"
msgstr ""
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:236
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:238
-#: ../java/src/net/i2p/router/web/SummaryRenderer.java:115
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:319
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:321
+#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142
msgid "max"
msgstr ""
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:237
-msgid "in average"
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:320
+msgid "In average"
msgstr ""
#: ../java/src/net/i2p/router/web/StatsGenerator.java:57
@@ -3315,12 +3500,12 @@ msgid "I2P Internals"
msgstr ""
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:99
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381
msgid "View existing tunnels and tunnel build status"
msgstr ""
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:105
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:255
msgid "Show all current peer connections"
msgstr ""
@@ -3348,67 +3533,67 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:135
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:136
msgid "Graph router performance"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:137
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138
msgid "Graphs"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:143
msgid "Textual router performance statistics"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:149
#: ../java/src/net/i2p/router/web/SummaryHelper.java:370
msgid "Local Destinations"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:149
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:151
#: ../java/strings/Strings.java:62
msgid "I2PTunnel"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
msgid "I2P Router Help"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
msgid "General"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:173
msgid "Local Identity"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:175
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177
msgid "Your unique I2P router identity is"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:181
msgid "never reveal it to anyone"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:181
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183
msgid "show"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
msgid "How long we've been running for this session"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197
msgid "Uptime"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:204
msgid ""
"Help with configuring your firewall and router for optimal I2P performance"
msgstr ""
#. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:232
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:234
#, java-format
msgid "Download {0} Update"
msgstr ""
@@ -3416,88 +3601,88 @@ msgstr ""
#. Note to translators: parameter is a date and time, e.g. "02-Mar 20:34 UTC"
#. <br> is optional, to help the browser make the lines even in the button
#. If the translation is shorter than the English, you should probably not include <br>
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:242
#, java-format
msgid "Download Unsigned<br>Update {0}"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:263
msgid "Active"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:272
msgid "Fast"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
msgid "High capacity"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:290
msgid "Known"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:303
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
msgid "Help with firewall configuration"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:307
msgid "Check NAT/firewall"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:325
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:327
msgid "Reseed"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:342
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:344
msgid "Configure router bandwidth allocation"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:344
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346
msgid "Bandwidth in/out"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:364
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:366
msgid "Total"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:371
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373
msgid "Used"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:386
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388
msgid "Exploratory"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:398
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
msgid "Participating"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:404
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406
msgid "Share ratio"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:410
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
msgid "What's in the router's job queue?"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:414
msgid "Congestion"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:419
msgid "Job lag"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:423
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:425
msgid "Message delay"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:429
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:431
msgid "Tunnel lag"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435
+#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
msgid "Backlog"
msgstr ""
@@ -3612,26 +3797,25 @@ msgstr ""
msgid "shared clients"
msgstr ""
-#. Note to translators: all runtime zh translation disabled in this file, no font available in RRD
-#: ../java/src/net/i2p/router/web/SummaryRenderer.java:89
+#: ../java/src/net/i2p/router/web/SummaryRenderer.java:110
#, java-format
msgid "events in {0}"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryRenderer.java:91
+#: ../java/src/net/i2p/router/web/SummaryRenderer.java:112
#, java-format
msgid "averaged for {0}"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryRenderer.java:101
+#: ../java/src/net/i2p/router/web/SummaryRenderer.java:122
msgid "Events per period"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryRenderer.java:114
+#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141
msgid "avg"
msgstr ""
-#: ../java/src/net/i2p/router/web/SummaryRenderer.java:116
+#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143
msgid "now"
msgstr ""
@@ -4065,22 +4249,6 @@ msgstr ""
msgid "itag2"
msgstr ""
-#. Descriptions for the stats that are graphed by default
-#. There are over 500 stats currently defined, we aren't going to tag them all
-#: ../java/strings/Strings.java:101
-msgid "Low-level bandwidth receive rate"
-msgstr ""
-
-#. bw.recvRate
-#: ../java/strings/Strings.java:102
-msgid "Low-level bandwidth send rate"
-msgstr ""
-
-#. bw.sendRate
-#: ../java/strings/Strings.java:103
-msgid "How many peers we are actively talking with"
-msgstr ""
-
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:112
msgid "config networking"
msgstr ""
@@ -4099,8 +4267,9 @@ msgstr ""
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:223
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:226
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:234
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:223
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:261
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:226
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:226
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:226
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:226
@@ -4133,8 +4302,9 @@ msgstr ""
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:236
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:239
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:247
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:274
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:239
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:239
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:239
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:239
@@ -4168,8 +4338,9 @@ msgstr ""
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:240
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:243
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:251
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:240
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:278
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:243
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:243
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:243
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:243
@@ -4262,7 +4433,7 @@ msgstr ""
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:395
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:360
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:351
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:383
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:387
msgid "Cancel"
msgstr ""
@@ -4403,13 +4574,13 @@ msgid "Specify Port"
msgstr ""
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:527
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:357
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:348
-msgid "Note"
+msgid "Notes"
msgstr ""
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:530
-msgid "Changing these settings will restart your router."
+msgid ""
+"a) Do not reveal your port numbers to anyone! b) Changing these settings "
+"will restart your router."
msgstr ""
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:536
@@ -5204,6 +5375,11 @@ msgstr ""
msgid "If you prefer the command line, you can also run the "
msgstr ""
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:357
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:348
+msgid "Note"
+msgstr ""
+
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:359
msgid ""
"If you are running I2P as service right now, removing it will shut down your "
@@ -5403,41 +5579,41 @@ msgstr ""
msgid "Update policy"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:349
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:351
msgid "Update through the eepProxy?"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:353
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:355
msgid "eepProxy host"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:357
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:359
msgid "eepProxy port"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:361
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:365
msgid "Update URLs"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:365
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:369
msgid "Trusted keys"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:369
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:373
msgid "Update with unsigned development builds?"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:373
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:377
msgid "Unsigned Build URL"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:379
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:383
msgid ""
"I2P updates are disabled because you do not have write permission for the "
"install directory."
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:389
msgid "Save"
msgstr ""
@@ -5519,7 +5695,7 @@ msgstr ""
msgid "graphs"
msgstr ""
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:249
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:287
msgid "I2P Performance Graphs"
msgstr ""
diff --git a/apps/susidns/locale/messages_en.po b/apps/susidns/locale/messages_en.po
index f907ba15474147dcbcaffeff180414c432e3abca..630242f3a6a8d302bdf94826830d25d1d034eb9c 100644
--- a/apps/susidns/locale/messages_en.po
+++ b/apps/susidns/locale/messages_en.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: I2P susidns\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"POT-Creation-Date: 2011-06-11 08:23+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"
@@ -18,122 +18,209 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:200
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:193
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:197
-msgid "Search"
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:130
+#, java-format
+msgid "Host name \"{0}\" contains illegal character {1}"
+msgstr ""
+
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:143
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:145
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:152
+#, java-format
+msgid "Host name cannot start with \"{0}\""
+msgstr ""
+
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:147
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:149
+#, java-format
+msgid "Host name cannot end with \"{0}\""
msgstr ""
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:204
-msgid "Search within filtered list"
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:154
+#, java-format
+msgid "Host name cannot contain \"{0}\""
msgstr ""
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:206
-msgid "Filtered list"
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:157
+#, java-format
+msgid ""
+"Host name \"{0}\" requires conversion to ASCII but the conversion library is "
+"unavailable in this JVM"
msgstr ""
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:210
-msgid "no matches"
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:209
+msgid "None"
msgstr ""
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:213
-msgid "Addressbook"
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:217
+msgid "Hashcash"
msgstr ""
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:215
-msgid "contains no entries"
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:219
+msgid "Hidden"
msgstr ""
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:217
-msgid "contains 1 entry"
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:221
+msgid "Signed"
msgstr ""
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:219
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:223
#, java-format
-msgid "contains {0} entries"
+msgid "Type {0}"
msgstr ""
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:229
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:232
+#, java-format
+msgid "One result for search within filtered list."
+msgid_plural "{0} results for search within filtered list."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:236
+#, java-format
+msgid "Filtered list contains 1 entry."
+msgid_plural "Fltered list contains {0} entries."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:241
+#, java-format
+msgid "One result for search."
+msgid_plural "{0} results for search."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:250
+#, java-format
+msgid "Address book contains 1 entry."
+msgid_plural "Address book contains {0} entries."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:266
#, java-format
msgid "Showing {0} of {1}"
msgstr ""
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:260
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:368
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:287
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:231
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:392
msgid "Add"
msgstr ""
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:260
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:265
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:366
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:287
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:298
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:231
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:243
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:390
msgid "Replace"
msgstr ""
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:264
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:297
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:242
#, java-format
-msgid "Host name {0} is already in addressbook, unchanged."
+msgid "Host name {0} is already in address book, unchanged."
msgstr ""
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:266
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:299
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:244
#, java-format
msgid ""
-"Host name {0} is already in addressbook with a different destination. Click "
+"Host name {0} is already in address book with a different destination. Click "
"\"Replace\" to overwrite."
msgstr ""
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:278
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:311
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:257
#, java-format
msgid "Destination added for {0}."
msgstr ""
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:280
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:313
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:259
#, java-format
msgid "Destination changed for {0}."
msgstr ""
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:285
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:315
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:261
+msgid "Warning - host name does not end with \".i2p\""
+msgstr ""
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:320
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:269
msgid "Invalid Base 64 destination."
msgstr ""
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:289
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:326
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:275
+#, java-format
+msgid "Invalid host name \"{0}\"."
+msgstr ""
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:329
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:278
msgid "Please enter a host name and destination"
msgstr ""
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:293
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:314
+#. clear search when deleting
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:333
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:354
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:282
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:307
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:261
+msgid "Delete Entry"
+msgstr ""
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:333
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:282
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:334
msgid "Delete Selected"
msgstr ""
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:303
+#. parameter is a host name
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:347
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:299
#, java-format
msgid "Destination {0} deleted."
msgstr ""
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:305
+#. parameter will always be >= 2
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:350
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:302
#, java-format
-msgid "{0} destinations deleted."
+msgid "1 destination deleted."
+msgid_plural "{0} destinations deleted."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:352
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:304
+msgid "No entries selected to delete."
msgstr ""
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:311
-msgid "Addressbook saved."
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:360
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:311
+msgid "Address book saved."
msgstr ""
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:314
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:363
msgid "ERROR: Could not write addressbook file."
msgstr ""
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:319
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:368
#: ../src/java/src/i2p/susi/dns/ConfigBean.java:148
-#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:151
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:315
+#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:156
msgid ""
"Invalid form submission, probably because you used the \"back\" or \"reload"
"\" button on your browser. Please resubmit."
msgstr ""
#: ../src/java/src/i2p/susi/dns/ConfigBean.java:139
-#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:130
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:130
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:130
+#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:131
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:132
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:132
msgid "Save"
msgstr ""
@@ -142,9 +229,9 @@ msgid "Configuration saved."
msgstr ""
#: ../src/java/src/i2p/susi/dns/ConfigBean.java:142
-#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:145
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:128
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:128
+#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:150
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:130
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:130
msgid "Reload"
msgstr ""
@@ -152,229 +239,346 @@ msgstr ""
msgid "Configuration reloaded."
msgstr ""
-#. Yes this is a hack.
-#. No it doesn't work on a text-mode browser.
-#. Fetching from the addressbook servlet
-#. with the correct parameters will kick off a
-#. config reload and fetch.
-#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:139
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:105
+#, java-format
+msgid "{0} address book in {1} database"
+msgstr ""
+
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:252
+msgid "Manually added via SusiDNS"
+msgstr ""
+
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:266
+#, java-format
+msgid "Failed to add Destination for {0} to naming service {1}"
+msgstr ""
+
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:290
+#, java-format
+msgid "Failed to delete Destination for {0} from naming service {1}"
+msgstr ""
+
+#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:143
msgid ""
"Subscriptions saved, updating addressbook from subscription sources now."
msgstr ""
-#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:143
+#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:148
msgid "Subscriptions saved."
msgstr ""
-#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:147
+#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:152
msgid "Subscriptions reloaded."
msgstr ""
#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:125
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:145
-msgid "addressbook"
+msgid "address book"
msgstr ""
#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:127
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:143
#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:104
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:93
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:120
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:108
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:124
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:107
#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:104
-msgid "addressbooks"
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:120
+msgid "Overview"
msgstr ""
#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:129
#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:106
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:95
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:110
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:93
#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:106
-msgid "private"
+msgid "Address books"
msgstr ""
#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:131
#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:108
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:97
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:112
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:95
#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:108
-msgid "master"
+msgid "private"
msgstr ""
#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:133
#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:110
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:99
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:114
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:97
#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:110
-msgid "router"
+msgid "master"
msgstr ""
#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:135
#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:112
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:101
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:116
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:99
#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:112
-msgid "published"
+msgid "router"
msgstr ""
#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:137
#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:114
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:103
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:102
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:118
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:101
#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:114
-msgid "subscriptions"
+msgid "published"
msgstr ""
#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:139
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:102
#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:116
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:105
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:120
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:103
#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:116
-msgid "configuration"
+msgid "Subscriptions"
msgstr ""
#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:141
#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:118
-#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:107
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:122
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:105
#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:118
-msgid "overview"
+msgid "Configuration"
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:163
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:145
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:126
+msgid "Address book"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:150
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:131
+msgid "Storage"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:169
msgid "Filter"
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:166
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:172
+msgid "other"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:174
msgid "all"
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:177
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:185
msgid "Current filter"
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:182
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:190
msgid "clear filter"
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:224
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:201
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:205
+msgid "Search"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:238
msgid "Name"
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:226
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:362
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:240
+msgid "Links"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:242
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:384
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:253
msgid "Destination"
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:257
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:273
msgid "Mark for deletion"
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:279
-msgid "address helper link"
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:292
+msgid "Base 32 address"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:296
+msgid "More information on this entry"
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:312
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:299
+msgid "details"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:332
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:388
msgid "Cancel"
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:345
-msgid "This addressbook is empty."
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:365
+msgid "This address book is empty."
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:356
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:378
msgid "Add new destination"
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:358
-msgid "Hostname"
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:380
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:158
+msgid "Host Name"
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:132
-msgid "Hints"
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:102
+msgid "configuration"
msgstr ""
#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:134
+msgid "Hints"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:136
msgid ""
"File and directory paths here are relative to the addressbook's working "
"directory, which is normally ~/.i2p/addressbook/ (Linux) or %APPDATA%\\I2P"
"\\addressbook\\ (Windows)."
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:136
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:138
msgid ""
"If you want to manually add lines to an addressbook, add them to the private "
"or master addressbooks."
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:138
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:140
msgid ""
"The router addressbook and the published addressbook are updated by the "
"addressbook application."
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:140
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:142
msgid ""
"When you publish your addressbook, ALL destinations from the master and "
"router addressbooks appear there."
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:142
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:144
msgid ""
"Use the private addressbook for private destinations, these are not "
"published."
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:144
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:146
msgid "Options"
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:146
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:148
msgid "File containing the list of subscriptions URLs (no need to change)"
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:148
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:150
msgid "Update interval in hours"
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:150
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:152
msgid ""
"Your public hosts.txt file (choose a path within your webserver document "
"root)"
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:152
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:154
msgid "Your hosts.txt (don't change)"
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:154
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:156
msgid "Your personal addressbook, these hosts will be published"
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:156
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:158
msgid "Your private addressbook, it is never published"
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:158
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:160
msgid "Port for your eepProxy (no need to change)"
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:160
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:162
msgid "Hostname for your eepProxy (no need to change)"
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:162
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:164
msgid "Whether to update the published addressbook"
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:164
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:166
msgid ""
"File containing the etags header from the fetched subscription URLs (no need "
"to change)"
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:166
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:168
msgid ""
"File containing the modification timestamp for each fetched subscription URL "
"(no need to change)"
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:168
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:170
msgid "File to log activity to (change to /dev/null if you like)"
msgstr ""
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:106
+msgid "addressbook"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:174
+msgid "Encoded Name"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:190
+msgid "Base 32 Address"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:200
+msgid "Address Helper"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:207
+msgid "link"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:211
+msgid "Public Key"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:213
+msgid "ElGamal 2048 bit"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:217
+msgid "Signing Key"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:219
+msgid "DSA 1024 bit"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:223
+msgid "Certificate"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:229
+msgid "Added Date"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:235
+msgid "Source"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:241
+msgid "Last Modified"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:247
+msgid "Notes"
+msgstr ""
+
#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:91
msgid "Introduction"
msgstr ""
@@ -384,7 +588,7 @@ msgid "What is the addressbook?"
msgstr ""
#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:111
-msgid "The addressbook application is part of your i2p installation."
+msgid "The addressbook application is part of your I2P installation."
msgstr ""
#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:113
@@ -395,8 +599,8 @@ msgstr ""
#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:115
msgid ""
-"In the default configuration, the addressbook is only subscribed to www.i2p2."
-"i2p."
+"In the default configuration, the address book is only subscribed to www."
+"i2p2.i2p."
msgstr ""
#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:117
@@ -407,75 +611,79 @@ msgstr ""
#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:119
msgid ""
-"For more information on naming in i2p, see <a href=\"http://www.i2p2.i2p/"
+"For more information on naming in I2P, see <a href=\"http://www.i2p2.i2p/"
"naming.html\">the overview on www.i2p2.i2p</a>."
msgstr ""
#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:121
-msgid "How does the addressbook work?"
+msgid "How does the addressbook application work?"
msgstr ""
#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:123
msgid ""
"The addressbook application regularly polls your subscriptions and merges "
-"their content into your \"router\" addressbook, stored in the hosts.txt file."
+"their content into your \"router\" address book."
msgstr ""
#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:125
msgid ""
-"Then it merges your \"master\" addressbook (userhosts.txt) into the router "
-"addressbook as well."
+"Then it merges your \"master\" address book into the router address book as "
+"well."
msgstr ""
#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:127
msgid ""
-"If configured, the router addressbook is now written to the \"published\" "
-"addressbook, which will be publicly available if you are running an eepsite."
+"If configured, the router address book is now written to the \"published\" "
+"address book, which will be publicly available if you are running an eepsite."
msgstr ""
#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:129
msgid ""
-"The router also uses a private addressbook (privatehosts.txt, not shown in "
-"the picture), which is not merged or published."
+"The router also uses a private address book (not shown in the picture), "
+"which is not merged or published."
msgstr ""
#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:131
msgid ""
-"Hosts in the private addressbook can be accessed by you but their addresses "
+"Hosts in the private address book can be accessed by you but their addresses "
"are never distributed to others."
msgstr ""
#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:133
msgid ""
-"The private addressbook can also be used for aliases of hosts in your other "
-"addressbooks."
+"The private address book can also be used for aliases of hosts in your other "
+"address books."
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:132
-msgid "The subscription file contains a list of i2p URLs."
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:102
+msgid "subscriptions"
msgstr ""
#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:134
+msgid "The subscription file contains a list of i2p URLs."
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:136
msgid ""
"The addressbook application regularly checks this list for new eepsites."
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:136
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:138
msgid "Those URLs refer to published hosts.txt files."
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:138
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:140
msgid ""
"The default subscription is the hosts.txt from www.i2p2.i2p, which is "
"updated infrequently."
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:140
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:142
msgid ""
"So it is a good idea to add additional subscriptions to sites that have the "
"latest addresses."
msgstr ""
-#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:142
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:144
msgid "See the FAQ for a list of subscription URLs."
msgstr ""