From 7e4ff0ba85bab73323c3eab786ac68d5914922a7 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 18 Jan 2018 09:08:46 +0000
Subject: [PATCH] poupdate

---
 apps/i2ptunnel/locale/messages_en.po     | 1003 ++++---
 apps/routerconsole/locale/messages_en.po | 3457 +++++++++++-----------
 apps/susimail/locale/messages_en.po      |  329 +-
 3 files changed, 2485 insertions(+), 2304 deletions(-)

diff --git a/apps/i2ptunnel/locale/messages_en.po b/apps/i2ptunnel/locale/messages_en.po
index 0db1ebf01e..6bf2e412f1 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: 2017-10-25 13:37+0000\n"
+"POT-Creation-Date: 2018-01-18 09:06+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,1350 +18,1401 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:400
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:410
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:424
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:434
 msgid "internal"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:444
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:471
+#, java-format
+msgid "{0} inbound tunnel"
+msgid_plural "{0} inbound tunnels"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:473
+#, java-format
+msgid "{0} outbound tunnel"
+msgid_plural "{0} outbound tunnels"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:475
 #, java-format
 msgid "{0} inbound, {0} outbound tunnel"
 msgid_plural "{0} inbound, {0} outbound tunnels"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:448
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:479
 msgid "lower bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:450
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:481
 msgid "standard bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:452
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:483
 msgid "higher bandwidth and reliability"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:89
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:583
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:92
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:594
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:162
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:176
 msgid ""
 "Invalid form submission, probably because you used the 'back' or 'reload' "
 "button on your browser. Please resubmit."
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:164
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:178
 msgid ""
 "If the problem persists, verify that you have cookies enabled in your "
 "browser."
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:210
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:235
 msgid "Configuration reloaded for all tunnels"
 msgstr ""
 
 #. and give them something to look at in any case
 #. FIXME name will be HTML escaped twice
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:224
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:249
 msgid "Starting tunnel"
 msgstr ""
 
 #. and give them something to look at in any case
 #. FIXME name will be HTML escaped twice
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:238
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:263
 msgid "Stopping tunnel"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:327
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:369
 msgid "New Tunnel"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:347
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:367
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:453
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:389
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:409
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:495
 msgid "Port not set"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:350
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:455
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:392
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:497
 msgid "Invalid port"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:353
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:395
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:362
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:404
 msgid "Warning - duplicate port"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:379
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:421
 msgid "Standard client"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:380
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:422
 msgid "HTTP/HTTPS client"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:381
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:423
 msgid "IRC client"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:382
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:424
 msgid "Standard server"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:383
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:425
 msgid "HTTP server"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:384
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:426
 msgid "SOCKS 4/4a/5 proxy"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:385
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:427
 msgid "SOCKS IRC proxy"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:386
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:428
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:387
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:429
 msgid "IRC server"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:388
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:430
 msgid "Streamr client"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:389
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:431
 msgid "Streamr server"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:390
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:432
 msgid "HTTP bidir"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:447
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:394
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:489
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:408
 msgid "Host not set"
 msgstr ""
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:449
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:491
 msgid "Invalid address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:138
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:138
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:159
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:140
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:158
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:169
 msgid "Hidden Services Manager"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:142
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:163
 msgid "Edit Client Tunnel"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:163
+msgid "Edit Hidden Service"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:197
 msgid "Edit proxy settings"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:181
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:208
 msgid "New proxy settings"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:221
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:221
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:186
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:361
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:248
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:900
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:200
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:375
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:386
 msgid "Name"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:223
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:188
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:363
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:250
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:902
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:202
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:377
 msgid "Type"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:225
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:225
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:252
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:904
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:388
 msgid ""
 "Name of tunnel to be displayed on Tunnel Manager home page and the router "
 "console sidebar"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:231
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:231
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:530
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:910
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:544
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:392
 msgid "Description"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:233
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:233
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:260
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:912
 msgid "Auto Start Tunnel"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:235
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:235
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:262
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:914
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:394
 msgid "Description of tunnel to be displayed on Tunnel Manager home page"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:918
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:599
 msgid ""
 "Enable this option to ensure this service is available when the router starts"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:243
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:270
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:922
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:603
 msgid "Automatically start tunnel when router starts"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:246
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:248
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:273
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:927
 msgid "Target"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:248
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:246
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:287
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:275
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:925
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:966
 msgid "Access Point"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:576
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:261
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:289
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:593
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:367
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:278
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:603
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:940
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:968
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1442
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:381
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:504
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:529
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:724
 msgid "Port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:256
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:274
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:357
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:294
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:384
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:945
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:973
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1030
 msgid "required"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:261
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:288
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:531
 msgid "Specify the local port this service should be accessible from"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:268
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:566
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:253
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:583
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:593
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:932
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1432
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:481
 msgid "Host"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:279
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:306
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:934
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:483
 msgid "Hostname or IP address of the target server"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:285
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:306
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:985
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:557
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:732
 msgid "Reachable by"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:287
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:314
 msgid "Local interface (ip address) the client tunnel will be reachable from"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:335
 msgid "Use SSL?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:337
 msgid ""
 "If you are accessing a service on a remote I2P router, you may wish to "
 "connect with SSL to avoid traffic interception. The client application "
 "should be also be configured to use SSL."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:341
 msgid "Clients use SSL to connect to tunnel"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:347
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:422
 msgid "Outproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:349
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:360
 msgid ""
 "Specify the .i2p address or destination (b32 or b64) of the outproxy here."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:324
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:335
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:364
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:391
 msgid ""
 "For a random selection from a pool, separate with commas e.g. server1.i2p,"
 "server2.i2p"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:358
 msgid "SSL Outproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:341
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:368
 msgid "Use Outproxy Plugin"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:370
 msgid ""
 "If an outproxy plugin is installed (e.g. Orchid), use this instead of any "
 "configured outproxies to access websites outside of I2P"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:347
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:374
 msgid "Use plugin instead of above-listed proxies if available"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:352
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:379
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:444
 msgid "Tunnel Destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:389
 msgid ""
 "Specify the .i2p address or destination (b32 or b64) of the tunnel here."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:395
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:450
 msgid "name, name:port, or destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:371
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:398
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:454
 msgid "b32 not recommended"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:404
 msgid "Shared Client"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:379
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:406
 msgid ""
 "Traffic from all clients with this feature enabled will be routed over the "
 "same set of tunnels. This will make profiling the tunnels by an adversary "
 "more difficult, but will link the clients together."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:383
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:410
 msgid ""
 "Share tunnels with other clients and irc/httpclients? (Change requires "
 "restart of client proxy tunnel)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:388
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:415
 msgid "Enable DCC"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:390
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:417
 msgid "Enables direct chat and file transfers, bypassing I2P"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:421
 msgid ""
 "Enable Direct Client-to-Client protocol. Note that this will compromise your "
 "anonymity and is <i>not</i> recommended."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:432
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:425
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1111
 msgid "Advanced networking options"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:403
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:430
 msgid ""
 "Note: When this client proxy is configured to share tunnels, then these "
 "options are for all the shared proxy clients!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:407
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1113
 msgid "Tunnel Options"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:409
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1124
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1287
 msgid "Length"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:411
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1126
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1289
 msgid "Variance"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1128
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1291
 msgid "Length of each Tunnel"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:447
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:447
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1135
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1298
 msgid "0 hop tunnel (no anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:424
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1139
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1302
 msgid "1 hop tunnel (low anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1143
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1306
 msgid "2 hop tunnel (medium anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:432
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1147
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1310
 msgid "3 hop tunnel (high anonymity)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:451
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1166
 msgid "hop tunnel (very poor performance)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:483
 msgid "Level of Randomization for Tunnel Length"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1178
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1327
 msgid "0 hop variance (no randomization, consistent performance)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:467
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:494
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:494
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1182
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1331
 msgid ""
 "+ 0-1 hop variance (medium additive randomization, subtractive performance)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1335
 msgid ""
 "+ 0-2 hop variance (high additive randomization, subtractive performance)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:502
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:502
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1190
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1339
 msgid "+/- 0-1 hop variance (standard randomization, standard performance)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:506
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:506
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1194
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1343
 msgid "+/- 0-2 hop variance (not recommended)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:490
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:517
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1205
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1354
 msgid "hop variance"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:495
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:522
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:522
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1210
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1359
 msgid "Count"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:524
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:524
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1212
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1361
 msgid "Backup Count"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:526
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1214
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1363
 msgid "Number of Tunnels in Group"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:503
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:530
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:530
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1218
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1367
 msgid "Number of Reserve Tunnels"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:510
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:537
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:537
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1255
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:514
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1259
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:545
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:545
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1263
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:522
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:549
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:549
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1267
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:530
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:557
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:557
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1229
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1235
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1241
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1247
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1276
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1383
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1389
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1395
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1403
 msgid "backup tunnels"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:537
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:564
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:564
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1413
 msgid "Profile"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:539
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:566
 msgid "Delay Connect"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:541
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:566
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:568
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1415
 msgid "Connection Profile"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:548
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:573
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:575
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1422
 msgid "interactive connection"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:552
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:577
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:579
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1426
 msgid "bulk connection (downloads/websites/BT)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:554
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:581
 msgid "Delay Connection"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:558
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:585
 msgid "for request/response connections"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:564
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:581
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:591
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1430
 msgid "Router I2CP Address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:568
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:585
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:595
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1434
 msgid "I2CP Hostname or IP"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:578
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:595
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:605
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1444
 msgid "I2CP Port Number"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:588
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:615
 msgid "Delay tunnel open until required"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:590
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:617
 msgid "Conserve resources by only creating tunnels when required"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:594
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:621
 msgid ""
 "Delay opening client tunnel until activity is detected on the configured "
 "tunnel port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:598
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:784
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:625
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1633
 msgid "Reduce tunnel quantity when idle"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:600
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:627
 msgid ""
 "Reduce tunnel count when idle but keep tunnel open (to ensure immediate "
 "availability)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:604
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:788
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:631
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1637
 msgid "Reduce tunnel quantity when idle to conserve resources"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:606
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:608
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:790
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:633
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:635
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1639
 msgid "Reduced tunnel count"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:612
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:626
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:796
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:639
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:653
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1645
 msgid "Idle period"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:614
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:641
 msgid "Reduced Tunnel Idle Time"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:618
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:645
 msgid "Close tunnels when idle"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:620
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:647
 msgid "To conserve resources, close tunnels when not in use"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:624
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:651
 msgid "Close client tunnels after specified idle period"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:628
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:655
 msgid "Close Tunnel Idle Time"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:632
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:659
 msgid "New Keys on Reopen"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:634
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:661
 msgid "Change tunnel identity (destination) when tunnels reopen"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:638
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:665
 msgid "Enable"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:640
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:667
 msgid "Retain tunnel identity (destination) when tunnels reopen"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:644
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:632
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:671
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1481
 msgid "Disable"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:648
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:675
 msgid "Persistent private key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:650
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:677
 msgid ""
 "Enabling this feature will ensure your tunnel identity (destination) remains "
 "static, for services offering features based on destination e.g. IRC user "
 "authentication"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:654
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:681
 msgid "Generate key to enable persistent client tunnel identity"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:656
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:683
 msgid "File"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:658
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:908
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:685
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1035
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1757
 msgid "Path to Private Key File"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:667
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:340
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:694
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1019
 msgid "Local destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:669
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:696
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1023
 msgid "Read Only: Local Destination (if known)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:673
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:700
 msgid "Local Base 32"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:681
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:708
 msgid "HTTP Filtering"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:683
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:710
 msgid ""
 "When enabled, the user agent of your web browser or http client will not be "
 "spoofed, potentially reducing your anonymity"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:687
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:714
 msgid "Do not spoof User-Agent header"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:689
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:716
 msgid ""
 "When enabled, the referer (originating page) of your web requests will not "
 "be filtered, potentially reducing your anonymity"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:693
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:720
 msgid "Do not block Referer header"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:695
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:722
 msgid ""
 "When enabled, the accept headers (mime types support) broadcast by your web "
 "browser will not be filtered, potentially reducing your anonymity"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:699
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:726
 msgid "Do not block Accept headers"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:701
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:728
 msgid "Allow SSL to I2P addresses when enabled"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:705
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:732
 msgid "Allow SSL to I2P addresses"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:712
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:867
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:739
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1716
 msgid "Signature type"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:715
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:742
 msgid "Experts only!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:717
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:872
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:744
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1721
 msgid "Legacy option (deprecated), provided for backward compatibility"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:739
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:893
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:766
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1742
 msgid "This is the default, recommended option"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:747
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:774
 msgid "Local Authorization"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:749
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:776
 msgid ""
 "Enable to require a username and password to access this local service (for "
 "example if hosting on a LAN)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:753
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:780
 msgid "Require local authorization for this service"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:755
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:771
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:782
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:798
 msgid "Username"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:757
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:784
 msgid "Set username required to access this service"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:759
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:777
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:786
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:804
 msgid "Password"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:761
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:788
 msgid "Set password required to access this service"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:763
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:790
 msgid "Outproxy Authorization"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:765
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:792
 msgid "Enable if the outproxy a username and password to access"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:769
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:796
 msgid "Outproxy requires authorization"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:773
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:800
 msgid "Enter username required by outproxy"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:779
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:806
 msgid "Enter password required by outproxy"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:786
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:813
 msgid "Jump URL List"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:788
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:815
 msgid ""
 "List of helper URLs to offer jumplinks from the web proxy error page when a "
 "host is not found in your addressbook"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:794
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:966
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:821
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1815
 msgid "Custom options"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:796
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:968
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:823
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1817
 msgid "Advanced options to control tunnel priority etc"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:800
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:972
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:567
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:827
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1821
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:578
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:791
 msgid "Cancel"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:804
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:976
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:831
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1825
 msgid "Delete this Proxy (cannot be undone)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:807
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:979
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:834
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1828
 msgid "Delete"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:809
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:981
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:836
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1830
 msgid "Save"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:816
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:988
-msgid "Tunnels not initialized yet; please retry in a few moments."
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:142
-msgid "Edit Hidden Service"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:849
 msgid "Edit Server Settings"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:181
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:860
 msgid "New Server Settings"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:271
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:950
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:506
 msgid "Specify the port the server is running on"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:277
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:956
 msgid ""
 "To avoid traffic sniffing if connecting to a remote server, you can enable "
 "an SSL connection. Note that the target server must be configured to accept "
 "SSL connections."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:281
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:960
 msgid "Use SSL to connect to target"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:978
 msgid ""
 "Port required to access service (this can be a different port to the port "
 "the service is hosted on)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:987
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:559
 msgid "Listening interface (IP address) for client access (normally 127.0.0.1)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:329
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1008
 msgid "Website Hostname"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1010
 msgid "Website Hostname e.g. mysite.i2p"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1014
 msgid "(leave blank for outproxies)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1021
 msgid "Private key file"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:392
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1071
 msgid "Generate a QR Code for this domain"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:400
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:934
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:942
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1079
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1783
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1791
 msgid "Generate QR Code"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:402
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:944
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1081
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1793
 msgid "Add to Private addressbook"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:408
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:950
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1087
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1799
 msgid "Add to local addressbook"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1089
 msgid "Register, unregister or change details for hostname"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:415
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1094
 msgid "Registration Authentication"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:421
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:956
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1100
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1805
 msgid ""
 "Note: In order to enable QR code generation or registration authentication, "
 "configure the Website Hostname field (for websites) or the Name field "
 "(everything else) above with an .i2p suffixed hostname e.g. mynewserver.i2p"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:483
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1118
+msgid "Inbound"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1171
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1320
 msgid "Level of Randomization for Tunnel Depth"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:603
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1285
+msgid "Outbound"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1452
 msgid "Encrypt Leaseset"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:605
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1454
 msgid "Only clients with the encryption key will be able to connect"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:609
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1458
 msgid "Only allow clients with the encryption key to connect to this server"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:611
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1460
 msgid "Encryption Key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:613
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1462
 msgid "Generate New Key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:615
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1464
 msgid "Tunnel must be stopped first"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:617
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1466
 msgid "Encryption key required to access this service"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:621
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1470
 msgid "Generate new encryption key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:624
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:572
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1473
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:583
 msgid "Generate"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:626
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1475
 msgid "Restricted Access List"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:628
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1477
 msgid "Allow all clients to connect to this service"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:634
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1483
 msgid "Prevent listed clients from connecting to this service"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:638
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1487
 msgid "Blacklist"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:640
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1489
 msgid "Only allow listed clients to connect to this service"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:644
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1493
 msgid "Whitelist"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:646
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1495
 msgid "Access List"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:648
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1497
 msgid "Specify clients, 1 per line"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:650
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1499
 msgid "Control access to this service"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:654
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1503
 msgid "Server Access Options"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:659
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1508
 msgid "Prevent clients from accessing this service via an inproxy"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:663
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1512
 msgid "Block Access via Inproxies"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:665
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1514
 msgid "Deny accesseses with referers (probably from inproxies)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:669
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1518
 msgid "Block Accesses containing Referers"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:671
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1520
 msgid "Deny User-Agents matching these strings (probably from inproxies)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:675
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1524
 msgid "Block these User-Agents"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:677
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1526
 msgid "comma separated, e.g. Mozilla,Opera (case-sensitive)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:684
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1533
 msgid ""
 "Use unique IP addresses for each connecting client (local non-SSL servers "
 "only)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:688
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1537
 msgid "Unique Local Address per Client"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:690
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1539
 msgid "Only enable if you are hosting this service on multiple routers"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:694
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1543
 msgid "Optimize for Multihoming"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:696
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1545
 msgid "Server Throttling"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:698
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1547
 msgid "Inbound connection limits (0=unlimited)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:700
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1549
 msgid "Per Minute"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:702
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1551
 msgid "Per Hour"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:704
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1553
 msgid "Per Day"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:706
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:749
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1555
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1598
 msgid "Per Client"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:708
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1557
 msgid ""
 "Maximum number of web page requests per minute for a unique client before "
 "access to the server is blocked"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:712
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1561
 msgid ""
 "Maximum number of web page requests per hour for a unique client before "
 "access to the server is blocked"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:716
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1565
 msgid ""
 "Maximum number of web page requests per day for a unique client before "
 "access to the server is blocked"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:720
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:761
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1569
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1610
 msgid "Total"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:722
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1571
 msgid ""
 "Total number of web page requests per minute before access to the server is "
 "blocked"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:726
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1575
 msgid ""
 "Total number of web page requests per hour before access to the server is "
 "blocked"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:730
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1579
 msgid ""
 "Total number of web page requests per day before access to the server is "
 "blocked"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:734
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1583
 msgid "Max concurrent connections (0=unlimited)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:736
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1585
 msgid "Maximum number of simultaneous client connections"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:743
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1592
 msgid "POST limits (0=unlimited)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:745
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1594
 msgid "Per Period"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:747
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1596
 msgid "Ban Duration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:751
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1600
 msgid ""
 "Maximum number of post requests permitted for a unique client for the "
 "configured timespan"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:755
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1604
 msgid ""
 "If a client exceeds the maximum number of post requests per allocated "
 "period, enforce a ban for this number of minutes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:759
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:771
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:779
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:802
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1608
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1620
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1628
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1651
 msgid "minutes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:763
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1612
 msgid "Total number of post requests permitted for the configured timespan"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:767
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1616
 msgid ""
 "If the maximum number of post requests per allocated period is exceeded, "
 "enforce a global access ban for this number of minutes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:773
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1622
 msgid "POST limit period"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:775
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1624
 msgid ""
 "Timespan for the maximum number of post requests to be reached before a ban "
 "is triggered"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:792
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1641
 msgid "Number of tunnels to keep open to maintain availability of service"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:798
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1647
 msgid "Period of inactivity before tunnel number is reduced"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:870
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1719
 msgid "Experts only! Changes B32!"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:906
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1755
 msgid "Alternate private key file"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:917
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1766
 msgid "Alternate local destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:919
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1768
 msgid "Read Only: Alternate Local Destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:154
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1840
+msgid "Tunnels not initialized yet; please retry in a few moments."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:164
 msgid "Status Messages"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:158
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:168
 msgid "Refresh"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:167
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:175
+msgid "Clear"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:181
 msgid "Global Tunnel Control"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:169
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:183
 msgid "Tunnel Wizard"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:173
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:187
 msgid "Stop All"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:177
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:191
 msgid "Start All"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:181
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:195
 msgid "Restart All"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:184
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:198
 msgid "I2P Hidden Services"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:190
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:204
 msgid "Points at"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:192
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:253
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:206
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
 msgid "Preview"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:194
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:369
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:208
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:383
 msgid "Status"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:196
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:371
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:210
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:385
 msgid "Control"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:205
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:219
 msgid "Edit Server Tunnel Settings for"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:220
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:234
 msgid "Test HTTPS server, bypassing I2P"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:242
 msgid "Test HTTP server, bypassing I2P"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:249
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:263
 msgid "Test HTTP server through I2P"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:272
 msgid "Base32 Address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:264
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:278
 msgid "No Preview"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:274
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:413
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:288
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:291
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:430
 msgid "Starting..."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:279
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:298
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:312
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:432
 msgid "Stop this Tunnel"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:286
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:425
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:442
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:300
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:319
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:439
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:473
 msgid "Stop"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:293
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:296
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:449
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:466
 msgid "Running"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:312
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:315
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:466
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:329
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:483
 msgid "Stopped"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:317
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:485
 msgid "Start this Tunnel"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:324
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:492
 msgid "Start"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:336
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:496
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:510
 msgid "Destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:341
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:355
 msgid "Hostname"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:353
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:367
 msgid "New hidden service"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:355
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:540
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:369
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:554
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:281
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:323
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:355
@@ -1370,213 +1421,213 @@ msgstr ""
 msgid "Standard"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:357
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:542
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:371
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:556
 msgid "Create"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:359
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:373
 msgid "I2P Client Tunnels"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:365
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:379
 msgid "Interface"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:380
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:394
 msgid "Edit Tunnel Settings for"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:432
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:435
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:449
 msgid "Standby"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:490
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:504
 msgid "Outproxy"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:517
 msgid "internal plugin"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:522
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:536
 msgid "none"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:538
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:552
 msgid "New client tunnel"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:162
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:191
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:173
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:202
 msgid "Registration Helper"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:220
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:231
 msgid ""
 "Please be sure to select, copy, and paste the entire contents of the "
 "appropriate authentication data into the form of your favorite registration "
 "site"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:222
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:233
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:678
 msgid "Tunnel name"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:241
 msgid "Website name"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:249
 msgid "Local Destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:246
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:257
 msgid "Local destination is not available. Start the tunnel."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:253
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:264
 msgid ""
 "To enable registration verification, edit tunnel and set name (or website "
 "name) to a valid host name ending in '.i2p'"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:259
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:270
 msgid ""
 "To enable registration verification, edit tunnel and set name to a valid "
 "host name ending in '.i2p'"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:268
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:279
 msgid "Destination signing key is not available. Start the tunnel."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:278
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:289
 #, java-format
 msgid "Authentication for adding host {0}"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:280
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:295
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:333
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:366
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:401
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:436
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:470
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:509
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:291
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:306
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:344
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:447
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:520
 msgid "Copy and paste this to the registration site"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:285
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:296
 msgid "Advanced authentication strings"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:304
 #, java-format
 msgid "Authentication for removing host {0}"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:324
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:335
 msgid "Authentication for changing name"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:349
 #, java-format
 msgid "This will change the name from {0} to {1}, using the same destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:344
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:355
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:388
 msgid "This tunnel must be configured with the new host name."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:346
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:379
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:357
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:390
 msgid "Enter old hostname below."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:357
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:368
 msgid "Authentication for adding alias"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:371
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:382
 #, java-format
 msgid "This will add an alias {0} for {1}, using the same destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:391
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:402
 msgid "Authentication for changing destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:406
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:417
 #, java-format
 msgid "This will change the destination for {0}"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:412
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:423
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:492
 msgid "This tunnel must be configured with the new destination."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:414
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:483
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:425
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:494
 msgid "Enter old destination below."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:437
 msgid "Authentication for adding alternate destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:441
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:486
 #, java-format
 msgid "This will add an alternate destination for {0}"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:498
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:509
 msgid "Authentication for adding subdomain"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:514
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:525
 #, java-format
 msgid "This will add a subdomain {0} of {1}, with a different destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:531
 msgid "This tunnel must be configured with the new subdomain and destination."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:522
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:533
 msgid "Enter higher-level domain and destination below."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:539
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:550
 msgid "Go back and edit the tunnel"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:561
 msgid "Specify old name and destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:563
 msgid "This is only required for advanced authentication."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:554
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:565
 msgid "See above for required items."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:561
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:572
 msgid "Old hostname"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:565
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:576
 msgid "Private Key File for old Destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:569
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:580
 msgid "Generate Authentication"
 msgstr ""
 
diff --git a/apps/routerconsole/locale/messages_en.po b/apps/routerconsole/locale/messages_en.po
index 8c76ec1a8b..956eccbb63 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: 2017-10-25 13:36+0000\n"
+"POT-Creation-Date: 2018-01-18 09:06+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,8 +26,8 @@ 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:1441
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1494
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1443
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1496
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
@@ -36,8 +36,8 @@ msgstr[1] ""
 
 #. seconds
 #. alternates: secs, sec. 'seconds' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1445
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1496
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1447
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1498
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
@@ -46,8 +46,8 @@ msgstr[1] ""
 
 #. minutes
 #. alternates: mins, min. 'minutes' is probably too long.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1449
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1498
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1451
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1500
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
@@ -56,8 +56,8 @@ msgstr[1] ""
 
 #. hours
 #. alternates: hrs, hr., hrs.
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1453
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1500
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1455
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1502
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
@@ -65,8 +65,8 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. days
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1456
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1503
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1458
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1505
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
@@ -74,37 +74,37 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. years
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1459
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1506
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1461
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1508
 #, java-format
 msgid "1 year"
 msgid_plural "{0} years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1461
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1508
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:404
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:829
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:835
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:850
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:857
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:864
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:873
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:880
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:887
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:894
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1463
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1510
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:406
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:830
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:836
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:851
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:858
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:865
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:874
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:881
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:888
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:895
 msgid "n/a"
 msgstr ""
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1490
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1492
 #, java-format
 msgid "1 ns"
 msgid_plural "{0,number,###} ns"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../../core/java/src/net/i2p/data/DataHelper.java:1492
+#: ../../../core/java/src/net/i2p/data/DataHelper.java:1494
 #, java-format
 msgid "1 μs"
 msgid_plural "{0,number,###} μs"
@@ -141,12 +141,12 @@ msgstr ""
 
 #: ../../../router/java/src/net/i2p/router/Blocklist.java:1065
 #: ../../../router/java/src/net/i2p/router/Blocklist.java:1120
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:51
-#: ../java/src/net/i2p/router/web/CertHelper.java:65
-#: ../java/src/net/i2p/router/web/CertHelper.java:95
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:978
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:573
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:140
+#: ../java/src/net/i2p/router/web/helpers/BanlistRenderer.java:52
+#: ../java/src/net/i2p/router/web/helpers/CertHelper.java:66
+#: ../java/src/net/i2p/router/web/helpers/CertHelper.java:96
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:985
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:605
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:168
 msgid "none"
 msgstr ""
 
@@ -155,18 +155,18 @@ msgid "IPs Permanently Banned"
 msgstr ""
 
 #: ../../../router/java/src/net/i2p/router/Blocklist.java:1075
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:101
 msgid "From"
 msgstr ""
 
 #: ../../../router/java/src/net/i2p/router/Blocklist.java:1077
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:74
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:102
 msgid "To"
 msgstr ""
 
 #. * IPv4 OK, IPv6 OK or disabled or no address
 #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:332
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:179
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:181
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:452
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:451
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:451
@@ -243,7 +243,7 @@ msgid "Port Conflict"
 msgstr ""
 
 #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:350
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:230
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:236
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:472
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:471
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:471
@@ -308,43 +308,50 @@ msgstr ""
 msgid "Rejecting tunnels"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:231
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:234
 #, java-format
 msgid "Reseeding: got router info from file ({0} successful, {1} errors)."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:306
-#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:30
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:339
+#: ../java/src/net/i2p/router/web/helpers/ConfigNavHelper.java:34
 msgid "Reseeding"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:329
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:354
+#, java-format
+msgid "Reseed successful, fetched {0} router info"
+msgid_plural "Reseed successful, fetched {0} router infos"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:360
 #, java-format
 msgid "Reseed fetched only 1 router."
 msgid_plural "Reseed fetched only {0} routers."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:338
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:384
 msgid "Reseed failed."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:339
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:385
 #, java-format
 msgid "See {0} for help."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:340
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:386
 msgid "reseed configuration page"
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:593
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:724
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:641
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:775
 msgid "Reseeding: fetching seed URL."
 msgstr ""
 
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:650
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:760
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:700
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:814
 #, java-format
 msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
@@ -386,9 +393,8 @@ msgid "Size of tunnel acceptor backlog"
 msgstr ""
 
 #: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:538
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:45
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:48
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:146
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHelper.java:59
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:148
 msgid "unknown"
 msgstr ""
 
@@ -419,7 +425,7 @@ msgid "UPnP is not enabled"
 msgstr ""
 
 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575
-#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27
+#: ../java/src/net/i2p/router/web/helpers/ConfigNavHelper.java:31
 msgid "Service"
 msgstr ""
 
@@ -431,10 +437,10 @@ msgstr ""
 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591
 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:618
 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:636
-#: ../java/src/net/i2p/router/web/PeerHelper.java:71
-#: ../java/src/net/i2p/router/web/PeerHelper.java:184
-#: ../java/src/net/i2p/router/web/PeerHelper.java:343
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:97
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:72
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:185
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:344
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:99
 msgid "Status"
 msgstr ""
 
@@ -460,9 +466,9 @@ msgstr ""
 
 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598
 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:625
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:421
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:447
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:427
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:453
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:487
 msgid "Uptime"
 msgstr ""
 
@@ -615,7 +621,7 @@ msgstr ""
 #: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1347
 #: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1411
 #: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1435
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:809
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:841
 msgid "Update downloaded"
 msgstr ""
 
@@ -648,13 +654,13 @@ msgstr ""
 #: ../java/src/net/i2p/router/update/DevSU3UpdateChecker.java:49
 #: ../java/src/net/i2p/router/update/DevSU3UpdateRunner.java:40
 #: ../java/src/net/i2p/router/update/PluginUpdateChecker.java:55
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:111
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:110
 #: ../java/src/net/i2p/router/update/UnsignedUpdateChecker.java:64
 #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:569
 #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177
-#: ../java/src/net/i2p/router/web/PluginStarter.java:174
+#: ../java/src/net/i2p/router/web/PluginStarter.java:177
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:578
 msgid "HTTP client proxy tunnel must be running"
 msgstr ""
 
@@ -669,8 +675,6 @@ msgstr ""
 #: ../java/src/net/i2p/router/update/DevSU3UpdateHandler.java:91
 #: ../java/src/net/i2p/router/update/PluginUpdateHandler.java:82
 #: ../java/src/net/i2p/router/update/UnsignedUpdateHandler.java:91
-#: ../java/src/net/i2p/router/update/UpdateHandler.java:52
-#: ../java/src/net/i2p/router/update/UpdateRunner.java:262
 msgid "Updating"
 msgstr ""
 
@@ -700,26 +704,26 @@ msgstr ""
 msgid "Checking for update of plugin {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:90
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:515
-#: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:44
-#: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:72
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:89
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:524
+#: ../java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java:50
+#: ../java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java:75
 #, java-format
 msgid "Bad URL {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:95
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:94
 #, java-format
 msgid "Attempting to install from file {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:98
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:97
 #, java-format
 msgid "Failed to install from file {0}, copy failed."
 msgstr ""
 
-#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:118
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:526
+#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:117
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:535
 #, java-format
 msgid "Downloading plugin from {0}"
 msgstr ""
@@ -776,13 +780,13 @@ msgid "Plugin {0} has mismatched versions"
 msgstr ""
 
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:393
-#: ../java/src/net/i2p/router/web/PluginStarter.java:325
+#: ../java/src/net/i2p/router/web/PluginStarter.java:328
 #, java-format
 msgid "This plugin requires I2P version {0} or higher"
 msgstr ""
 
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:401
-#: ../java/src/net/i2p/router/web/PluginStarter.java:335
+#: ../java/src/net/i2p/router/web/PluginStarter.java:338
 #, java-format
 msgid "This plugin requires Java version {0} or higher"
 msgstr ""
@@ -817,15 +821,15 @@ msgid "Plugin update requires installed plugin version {0} or lower"
 msgstr ""
 
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:457
-#: ../java/src/net/i2p/router/web/PluginStarter.java:346
+#: ../java/src/net/i2p/router/web/PluginStarter.java:349
 #, java-format
 msgid "Plugin requires Jetty version {0} or higher"
 msgstr ""
 
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:464
 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:471
-#: ../java/src/net/i2p/router/web/PluginStarter.java:357
-#: ../java/src/net/i2p/router/web/PluginStarter.java:367
+#: ../java/src/net/i2p/router/web/PluginStarter.java:360
+#: ../java/src/net/i2p/router/web/PluginStarter.java:370
 #, java-format
 msgid "Plugin requires Jetty version {0} or lower"
 msgstr ""
@@ -874,6 +878,12 @@ msgstr ""
 msgid "Failed to download plugin from {0}"
 msgstr ""
 
+#. set status before thread to ensure UI feedback
+#: ../java/src/net/i2p/router/update/UpdateHandler.java:52
+#: ../java/src/net/i2p/router/update/UpdateRunner.java:262
+msgid "Updating I2P"
+msgstr ""
+
 #: ../java/src/net/i2p/router/update/UpdateRunner.java:202
 #, java-format
 msgid "Updating from {0}"
@@ -884,26 +894,8 @@ msgstr ""
 msgid "No new version found at {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:68
-msgid "Permanently banned"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:70
-#, java-format
-msgid "Temporary ban expiring in {0}"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:72
-#, java-format
-msgid "Banned until restart or in {0}"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/BanlistRenderer.java:85
-msgid "unban now"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/CSSHelper.java:158
-#: ../java/src/net/i2p/router/web/HomeHelper.java:39
+#: ../java/src/net/i2p/router/web/CSSHelper.java:162
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:44
 #: ../java/strings/Strings.java:29
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/certs_jsp.java:285
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/certs_jsp.java:287
@@ -1011,384 +1003,749 @@ msgstr ""
 msgid "I2P Router Console"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/CertHelper.java:27
-msgid "Local SSL Certificates"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:529
+msgid "Shutdown gracefully"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/CertHelper.java:48
-#: ../java/src/net/i2p/router/web/CertHelper.java:53
-#: ../java/strings/Strings.java:63
-msgid "I2PTunnel"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:230
+msgid "Graceful shutdown initiated"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/CertHelper.java:56
-msgid "Local Router Family Certificate"
+#. Normal browsers send value, IE sends button label
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:231
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:235
+#: ../java/src/net/i2p/router/web/helpers/ConfigRestartBean.java:37
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:531
+msgid "Shutdown immediately"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/CertHelper.java:62
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:215
-msgid "Family"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:535
+msgid "Cancel graceful shutdown"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62
-msgid "Error updating the configuration - please see the error logs"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:238
+msgid "Graceful shutdown cancelled"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:406
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:371
-msgid "Configuration saved successfully"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:551
+msgid "Graceful restart"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74
-#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:629
-#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:40
-#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:85
-#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:104
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:408
-#: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:109
-#: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:160
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:373
-msgid ""
-"Error saving the configuration (applied but not saved) - please see the "
-"error logs"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:244
+msgid "Graceful restart requested"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:48
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:565
-msgid "Save Client Configuration"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:245
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:553
+msgid "Hard restart"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:52
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configi2cp_jsp.java:599
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configi2cp_jsp.java:603
-msgid "Save Interface Configuration"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:250
+msgid "Hard restart requested"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:56
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configwebapps_jsp.java:549
-msgid "Save WebApp Configuration"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:251
+msgid "Rekey and Restart"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:61
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configplugins_jsp.java:550
-msgid "Save Plugin Configuration"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:252
+msgid "Rekeying after graceful restart"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:68
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configplugins_jsp.java:567
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configplugins_jsp.java:571
-msgid "Install Plugin"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:255
+msgid "Rekey and Shutdown"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:77
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configplugins_jsp.java:579
-msgid "Install Plugin from File"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:256
+msgid "Rekeying after graceful shutdown"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:86
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configplugins_jsp.java:590
-msgid "Update All Installed Plugins"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:259
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:586
+msgid "Run I2P on startup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:138
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:175
-#, java-format
-msgid "Error stopping plugin {0}"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:261
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:588
+msgid "Don't run I2P on startup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:143
-#, java-format
-msgid "Deleted plugin {0}"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:263
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:612
+msgid "Dump threads"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:145
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:270
 #, java-format
-msgid "Error deleting plugin {0}"
+msgid "Threads dumped to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:170
-#, java-format
-msgid "Stopped plugin {0}"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:271
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:620
+msgid "View console on startup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:180
-#, java-format
-msgid "Stopped webapp {0}"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:273
+msgid "Console is to be shown on startup"
 msgstr ""
 
-#. label (IE)
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:209
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:354
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:355
-msgid "Start"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:622
+msgid "Do not view console on startup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:282
-msgid "New client added"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:276
+msgid "Console is not to be shown on startup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:287
-msgid "Client configuration saved successfully"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:277
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:608
+msgid "Force GC"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:297
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:323
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:338
-msgid "Bad client index."
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:279
+msgid "Full garbage collection requested"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:306
-#, java-format
-msgid "Client {0} stopped"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:280
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:565
+msgid "Show systray icon"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:328
-#, java-format
-msgid "Client {0} started"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:282
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:569
+msgid "Hide systray icon"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:343
-#, java-format
-msgid "Client {0} deleted"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:323
+msgid "Service installed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:358
-msgid "WebApp configuration saved."
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:325
+msgid "Warning: unable to install the service"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:372
-msgid "Plugin configuration saved."
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:332
+msgid "Service removed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:387
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:202
-msgid "WebApp"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:334
+msgid "Warning: unable to remove the service"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:387
-msgid "started"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:373
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:388
+msgid "Enabled system tray"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:389
-msgid "Failed to start"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:378
+msgid "Disabled system tray"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:394
-msgid "Failed to find server."
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:384
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:636
+#: ../java/src/net/i2p/router/web/helpers/ConfigFamilyHandler.java:39
+#: ../java/src/net/i2p/router/web/helpers/ConfigFamilyHandler.java:84
+#: ../java/src/net/i2p/router/web/helpers/ConfigFamilyHandler.java:103
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:358
+#: ../java/src/net/i2p/router/web/helpers/ConfigStatsHandler.java:125
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHandler.java:120
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHandler.java:144
+msgid "Restart required to take effect"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:400
-msgid "No plugin URL specified."
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:393
+msgid "Failed to start systray"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:421
-#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:47
-#: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:79
-msgid "You must enter a file"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:395
+msgid "Failed to stop systray"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:460
-msgid "Install from file failed"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:401
+#: ../java/src/net/i2p/router/web/helpers/ConfigAdvancedHandler.java:93
+#: ../java/src/net/i2p/router/web/helpers/ConfigAdvancedHandler.java:117
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:415
+msgid "Configuration saved successfully"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:475
-#, java-format
-msgid "No update URL specified for {0}"
+#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:403
+#: ../java/src/net/i2p/router/web/helpers/ConfigAdvancedHandler.java:95
+#: ../java/src/net/i2p/router/web/helpers/ConfigAdvancedHandler.java:119
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:638
+#: ../java/src/net/i2p/router/web/helpers/ConfigFamilyHandler.java:41
+#: ../java/src/net/i2p/router/web/helpers/ConfigFamilyHandler.java:86
+#: ../java/src/net/i2p/router/web/helpers/ConfigFamilyHandler.java:105
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:417
+#: ../java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java:133
+#: ../java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java:187
+msgid ""
+"Error saving the configuration (applied but not saved) - please see the "
+"error logs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:484
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:508
-msgid "Plugin or update download already in progress."
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:369
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:370
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:519
+msgid "Check for updates"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:489
-msgid "Updating all plugins"
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167
+msgid "Update or check already in progress"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:524
-#, java-format
-msgid "Installing plugin from {0}"
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190
+msgid "Update available, attempting to download now"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:545
-#, java-format
-msgid "Checking plugin {0} for updates"
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192
+msgid "Update available, click button on left to download"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:584
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:586
-#, java-format
-msgid "Started plugin {0}"
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
+msgid "No update available"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:589
-#, java-format
-msgid "Error starting plugin {0}"
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
+#: ../java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java:26
+#: ../java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java:29
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:538
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:542
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:598
+msgid "Save"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:611
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:112
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216
 #, java-format
-msgid "Added user {0}"
+msgid "Updating news URL to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:626
-msgid "Interface configuration saved"
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60
+msgid "internal"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:627
-#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:38
-#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:83
-#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:102
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:349
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:354
-#: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:124
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:115
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:139
-msgid "Restart required to take effect"
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227
+#, java-format
+msgid "Updating proxy host to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:98
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:361
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362
-msgid "Edit"
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235
+#, java-format
+msgid "Updating proxy port to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:107
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:561
-msgid "Add Client"
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251
+#, java-format
+msgid "Updating refresh frequency to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:832
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:546
-msgid "Client"
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:126
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:402
+msgid "Never"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:117
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:203
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:232
-msgid "Run at Startup?"
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259
+#, java-format
+msgid "Updating update policy to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:118
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:204
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:233
-msgid "Control"
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268
+msgid "Updating update URLs."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:119
-msgid "Class and arguments"
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280
+msgid "Updating trusted keys."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:205
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:234
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:284
-msgid "Description"
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292
+#, java-format
+msgid "Updating unsigned update URL to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:231
-msgid "Plugin"
+#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304
+#, java-format
+msgid "Updating signed development build URL to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:503
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:93
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:471
-msgid "Version"
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:128
+msgid "Every"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:250
-msgid "Signed by"
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:146
+msgid "Notify only"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:267
-msgid "Date"
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:153
+msgid "Download and verify only"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:273
-msgid "Author"
+#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:161
+msgid "Download, verify, and restart"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:289
-msgid "License"
+#: ../java/src/net/i2p/router/web/FormHandler.java:253
+msgid ""
+"Invalid form submission, probably because you used the 'back' or 'reload' "
+"button on your browser. Please resubmit."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294
-msgid "Website"
+#: ../java/src/net/i2p/router/web/FormHandler.java:255
+msgid ""
+"If the problem persists, verify that you have cookies enabled in your "
+"browser."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:302
-msgid "Update link"
+#: ../java/src/net/i2p/router/web/NewsHelper.java:293
+#, java-format
+msgid "News last updated {0} ago."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:358
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:359
-msgid "Stop"
+#: ../java/src/net/i2p/router/web/NewsHelper.java:299
+#, java-format
+msgid "News last checked {0} ago."
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NewsHelper.java:308
+msgid "Hide news"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NewsHelper.java:311
+msgid "Show news"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/NewsHelper.java:315
+msgid "Show all news"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/PluginStarter.java:160
+msgid "Checking for plugin updates"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/PluginStarter.java:175
+#: ../java/src/net/i2p/router/web/PluginStarter.java:181
+msgid "Plugin update check failed"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/PluginStarter.java:219
+#, java-format
+msgid "1 plugin updated"
+msgid_plural "{0} plugins updated"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../java/src/net/i2p/router/web/PluginStarter.java:221
+msgid "Plugin update check complete"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/StatSummarizer.java:338
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:242
+msgid "Bandwidth usage"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188
+#, java-format
+msgid "events in {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190
+#, java-format
+msgid "averaged for {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200
+msgid "Events per period"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryRenderer.java:222
+#: ../java/src/net/i2p/router/web/SummaryRenderer.java:235
+#: ../java/src/net/i2p/router/web/helpers/JobQueueHelper.java:155
+#: ../java/src/net/i2p/router/web/helpers/JobQueueHelper.java:157
+msgid "Avg"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryRenderer.java:223
+#: ../java/src/net/i2p/router/web/SummaryRenderer.java:236
+#: ../java/src/net/i2p/router/web/helpers/JobQueueHelper.java:156
+#: ../java/src/net/i2p/router/web/helpers/JobQueueHelper.java:158
+msgid "Max"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/SummaryRenderer.java:224
+#: ../java/src/net/i2p/router/web/SummaryRenderer.java:237
+msgid "Now"
+msgstr ""
+
+#. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns
+#. give the UI time to respond
+#: ../java/src/net/i2p/router/web/SummaryRenderer.java:250
+#: ../java/src/net/i2p/router/web/SummaryRenderer.java:253
+#: ../java/src/net/i2p/router/web/helpers/ConfigRestartBean.java:50
+msgid "Restart"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/BanlistRenderer.java:69
+msgid "Permanently banned"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/BanlistRenderer.java:71
+#, java-format
+msgid "Temporary ban expiring in {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/BanlistRenderer.java:73
+#, java-format
+msgid "Banned until restart or in {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/BanlistRenderer.java:86
+msgid "unban now"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/CertHelper.java:28
+msgid "Local SSL Certificates"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/CertHelper.java:49
+#: ../java/src/net/i2p/router/web/helpers/CertHelper.java:54
+#: ../java/strings/Strings.java:63
+msgid "I2PTunnel"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/CertHelper.java:57
+msgid "Local Router Family Certificate"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/CertHelper.java:63
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:216
+msgid "Family"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigAdvancedHandler.java:73
+msgid "Error updating the configuration - please see the error logs"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:57
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:565
+msgid "Save Client Configuration"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:61
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configi2cp_jsp.java:599
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configi2cp_jsp.java:603
+msgid "Save Interface Configuration"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:65
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configwebapps_jsp.java:549
+msgid "Save WebApp Configuration"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:70
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configplugins_jsp.java:550
+msgid "Save Plugin Configuration"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:77
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configplugins_jsp.java:567
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configplugins_jsp.java:571
+msgid "Install Plugin"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:86
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configplugins_jsp.java:579
+msgid "Install Plugin from File"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:95
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configplugins_jsp.java:590
+msgid "Update All Installed Plugins"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:147
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:184
+#, java-format
+msgid "Error stopping plugin {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:152
+#, java-format
+msgid "Deleted plugin {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:154
+#, java-format
+msgid "Error deleting plugin {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:179
+#, java-format
+msgid "Stopped plugin {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:189
+#, java-format
+msgid "Stopped webapp {0}"
+msgstr ""
+
+#. label (IE)
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:218
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:359
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:360
+msgid "Start"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:291
+msgid "New client added"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:296
+msgid "Client configuration saved successfully"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:306
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:332
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:347
+msgid "Bad client index."
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:315
+#, java-format
+msgid "Client {0} stopped"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:337
+#, java-format
+msgid "Client {0} started"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:352
+#, java-format
+msgid "Client {0} deleted"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:367
+msgid "WebApp configuration saved."
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:381
+msgid "Plugin configuration saved."
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:396
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:207
+msgid "WebApp"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:396
+msgid "started"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:398
+msgid "Failed to start"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:403
+msgid "Failed to find server."
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:409
+msgid "No plugin URL specified."
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:430
+#: ../java/src/net/i2p/router/web/helpers/ConfigFamilyHandler.java:48
+#: ../java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java:83
+msgid "You must enter a file"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:469
+msgid "Install from file failed"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:484
+#, java-format
+msgid "No update URL specified for {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:493
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:517
+msgid "Plugin or update download already in progress."
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:498
+msgid "Updating all plugins"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:533
+#, java-format
+msgid "Installing plugin from {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:554
+#, java-format
+msgid "Checking plugin {0} for updates"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:593
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:595
+#, java-format
+msgid "Started plugin {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:598
+#, java-format
+msgid "Error starting plugin {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:620
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHandler.java:117
+#, java-format
+msgid "Added user {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java:635
+msgid "Interface configuration saved"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:103
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:366
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:367
+msgid "Edit"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:112
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:561
+msgid "Add Client"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:121
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:839
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:578
+msgid "Client"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:122
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:208
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:237
+msgid "Run at Startup?"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:123
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:209
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:238
+msgid "Control"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:124
+msgid "Class and arguments"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:210
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:239
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:289
+msgid "Description"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:236
+msgid "Plugin"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:253
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:507
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:95
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:417
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:443
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:477
+msgid "Version"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:255
+msgid "Signed by"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:272
+msgid "Date"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:278
+msgid "Author"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:294
+msgid "License"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:299
+msgid "Website"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:307
+msgid "Update link"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:364
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:365
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:519
-msgid "Check for updates"
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:363
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:364
+msgid "Stop"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:366
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:367
-#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:371
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:372
+#: ../java/src/net/i2p/router/web/helpers/ConfigNavHelper.java:31
 msgid "Update"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:370
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:374
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:375
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:379
 msgid "Delete"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:372
+#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:377
 #, java-format
 msgid "Are you sure you want to delete {0}?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:27
+#: ../java/src/net/i2p/router/web/helpers/ConfigFamilyHandler.java:28
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:559
 msgid "Create Family"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:31
+#: ../java/src/net/i2p/router/web/helpers/ConfigFamilyHandler.java:32
 msgid "You must enter a family name"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:37
-#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:101
-#: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:158
+#: ../java/src/net/i2p/router/web/helpers/ConfigFamilyHandler.java:38
+#: ../java/src/net/i2p/router/web/helpers/ConfigFamilyHandler.java:102
+#: ../java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java:185
 msgid "Configuration saved successfully."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:42
+#: ../java/src/net/i2p/router/web/helpers/ConfigFamilyHandler.java:43
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:551
 msgid "Join Family"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:88
-#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:90
+#: ../java/src/net/i2p/router/web/helpers/ConfigFamilyHandler.java:89
+#: ../java/src/net/i2p/router/web/helpers/ConfigFamilyHandler.java:91
 msgid "Load from file failed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:95
+#: ../java/src/net/i2p/router/web/helpers/ConfigFamilyHandler.java:96
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:594
 msgid "Leave Family"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21
-#: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:22
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:1107
+#: ../java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java:23
+#: ../java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java:25
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHandler.java:27
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:1139
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:552
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:572
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:588
@@ -1396,9 +1753,9 @@ msgstr ""
 msgid "Delete selected"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22
-#: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:1125
+#: ../java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java:24
+#: ../java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java:26
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:1157
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:550
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:558
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:570
@@ -1408,111 +1765,125 @@ msgstr ""
 msgid "Add item"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:23
+#: ../java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java:25
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:556
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:576
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:592
 msgid "Restore defaults"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24
-#: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:538
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:542
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:598
-msgid "Save"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:29
+#: ../java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java:31
 msgid "Home page changed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:51
+#: ../java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java:53
 msgid "Restored default settings"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:63
+#: ../java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java:65
 msgid "No name entered"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:68
+#: ../java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java:70
 msgid "No URL entered"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:84
-#: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:81
+#: ../java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java:86
+#: ../java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java:84
 msgid "Added"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:101
-#: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:107
+#: ../java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java:103
+#: ../java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java:110
 msgid "Removed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:18
+#: ../java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java:20
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:559
 msgid "Add key"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:19
+#: ../java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java:21
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:557
 msgid "Delete key"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:21
+#: ../java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java:23
 msgid "You must enter a destination"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:23
+#: ../java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java:25
 msgid "You must enter a key"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:34
-#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:41
-#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:43
-msgid "Key for"
+#: ../java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java:35
+#: ../java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java:59
+msgid "Invalid destination"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:34
-msgid "added to keyring"
+#: ../java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java:40
+msgid "Invalid key"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:36
-msgid "Invalid destination or key"
+#: ../java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java:43
+#, java-format
+msgid "Key for {0} added to keyring"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:41
-msgid "removed from keyring"
+#: ../java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java:52
+#, java-format
+msgid "Key for {0} removed from keyring"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:43
-msgid "not found in keyring"
+#: ../java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java:55
+#, java-format
+msgid "Key for {0} not found in keyring"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:45
-msgid "Invalid destination"
+#: ../java/src/net/i2p/router/web/helpers/ConfigKeyringHelper.java:33
+msgid "Local encrypted destinations"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:85
+#: ../java/src/net/i2p/router/web/helpers/ConfigKeyringHelper.java:35
+msgid "Remote encrypted destinations"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigKeyringHelper.java:45
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:323
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:351
+msgid "Destination"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigKeyringHelper.java:46
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:222
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:1071
+msgid "Name"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigKeyringHelper.java:47
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:553
+msgid "Encryption Key"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigLoggingHandler.java:86
 msgid "Log overrides updated"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:166
+#: ../java/src/net/i2p/router/web/helpers/ConfigLoggingHandler.java:167
 msgid "Log configuration saved"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:43
+#: ../java/src/net/i2p/router/web/helpers/ConfigLoggingHelper.java:45
 #, java-format
 msgid "Add additional logging statements above (e.g. {0})."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:45
+#: ../java/src/net/i2p/router/web/helpers/ConfigLoggingHelper.java:47
 #, java-format
 msgid "Alternatively, put entries in the file {0} (e.g. {1})."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:47
+#: ../java/src/net/i2p/router/web/helpers/ConfigLoggingHelper.java:51
 #, java-format
 msgid "Valid log levels are {0}."
 msgstr ""
@@ -1520,57 +1891,57 @@ msgstr ""
 #. Homeland Security Advisory System
 #. http://www.dhs.gov/xinfoshare/programs/Copy_of_press_release_0046.shtm
 #. but pink instead of yellow for WARN
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:66
-#: ../java/src/net/i2p/router/web/LogsHelper.java:172
+#: ../java/src/net/i2p/router/web/helpers/ConfigLoggingHelper.java:70
+#: ../java/src/net/i2p/router/web/helpers/LogsHelper.java:134
 msgid "CRIT"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:66
+#: ../java/src/net/i2p/router/web/helpers/ConfigLoggingHelper.java:70
 msgid "DEBUG"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:66
-#: ../java/src/net/i2p/router/web/LogsHelper.java:174
+#: ../java/src/net/i2p/router/web/helpers/ConfigLoggingHelper.java:70
+#: ../java/src/net/i2p/router/web/helpers/LogsHelper.java:136
 msgid "ERROR"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:66
-#: ../java/src/net/i2p/router/web/LogsHelper.java:179
+#: ../java/src/net/i2p/router/web/helpers/ConfigLoggingHelper.java:70
+#: ../java/src/net/i2p/router/web/helpers/LogsHelper.java:141
 msgid "INFO"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:66
-#: ../java/src/net/i2p/router/web/LogsHelper.java:176
+#: ../java/src/net/i2p/router/web/helpers/ConfigLoggingHelper.java:70
+#: ../java/src/net/i2p/router/web/helpers/LogsHelper.java:138
 msgid "WARN"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:86
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:205
-#: ../java/src/net/i2p/router/web/HomeHelper.java:215
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:1037
+#: ../java/src/net/i2p/router/web/helpers/ConfigLoggingHelper.java:90
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHelper.java:210
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:220
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:1069
 msgid "Remove"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:123
+#: ../java/src/net/i2p/router/web/helpers/ConfigLoggingHelper.java:127
 msgid "Select a class to add"
 msgstr ""
 
 #. stat groups for stats.jsp
-#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26
+#: ../java/src/net/i2p/router/web/helpers/ConfigNavHelper.java:30
 #: ../java/strings/Strings.java:58
 msgid "Bandwidth"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26
+#: ../java/src/net/i2p/router/web/helpers/ConfigNavHelper.java:30
 msgid "Home Page"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551
+#: ../java/src/net/i2p/router/web/helpers/ConfigNavHelper.java:30
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:557
 msgid "Network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26
+#: ../java/src/net/i2p/router/web/helpers/ConfigNavHelper.java:30
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/certs_jsp.java:354
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:356
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:356
@@ -1623,1341 +1994,1078 @@ msgstr ""
 msgid "Summary Bar"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26
+#: ../java/src/net/i2p/router/web/helpers/ConfigNavHelper.java:30
 msgid "UI"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:815
+#: ../java/src/net/i2p/router/web/helpers/ConfigNavHelper.java:31
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:307
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:822
 #: ../java/strings/Strings.java:73
 msgid "Tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28
+#: ../java/src/net/i2p/router/web/helpers/ConfigNavHelper.java:32
 msgid "Clients"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28
+#: ../java/src/net/i2p/router/web/helpers/ConfigNavHelper.java:32
 msgid "Keyring"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28
+#: ../java/src/net/i2p/router/web/helpers/ConfigNavHelper.java:32
 msgid "Logging"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:290
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:602
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:665
+#: ../java/src/net/i2p/router/web/helpers/ConfigNavHelper.java:32
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:295
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:608
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:672
 #: ../java/strings/Strings.java:68
 msgid "Peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:664
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:383
+#: ../java/src/net/i2p/router/web/helpers/ConfigNavHelper.java:32
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:668
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:389
 msgid "Stats"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:29
+#: ../java/src/net/i2p/router/web/helpers/ConfigNavHelper.java:33
 msgid "I2CP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:29
+#: ../java/src/net/i2p/router/web/helpers/ConfigNavHelper.java:33
 msgid "Plugins"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:29
+#: ../java/src/net/i2p/router/web/helpers/ConfigNavHelper.java:33
 msgid "Web Apps"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:30
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:315
+#: ../java/src/net/i2p/router/web/helpers/ConfigNavHelper.java:34
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:320
 msgid "Advanced"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:30
+#: ../java/src/net/i2p/router/web/helpers/ConfigNavHelper.java:34
 msgid "Router Family"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:61
-#: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:555
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:62
+#: ../java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java:103
+#: ../java/src/net/i2p/router/web/helpers/ConfigTunnelsHandler.java:31
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:541
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:534
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:566
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:571
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:539
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:702
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:653
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:732
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:628
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:562
 msgid "Save changes"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:219
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:228
 msgid "Updating IP address"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:241
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:250
 msgid "Updating IPv6 setting"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:258
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:267
 msgid "Disabling TCP completely"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:263
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:272
 #, java-format
 msgid "Updating TCP address to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:270
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:279
 msgid "Disabling inbound TCP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:272
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:281
 msgid "Updating inbound TCP address to auto"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:285
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:294
 #, java-format
 msgid "Updating TCP port to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:287
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:312
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:296
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:321
 msgid "Warning - ports less than 1024 are not recommended"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:291
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:318
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:300
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:327
 msgid "Invalid port"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:296
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:305
 msgid "Updating inbound TCP port to auto"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:310
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:319
 #, java-format
 msgid "Updating UDP port to {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:335
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:344
 msgid "Gracefully restarting into Hidden Router Mode"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:337
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:346
 msgid "Gracefully restarting to exit Hidden Router Mode"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:346
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:355
 msgid "Enabling UPnP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:348
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:357
 msgid "Disabling UPnP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:357
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:366
 msgid "Enabling laptop mode"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:359
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:368
 msgid "Disabling laptop mode"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:366
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:375
 msgid "Disabling inbound IPv4"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:368
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:377
 msgid "Enabling inbound IPv4"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:376
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:385
 msgid "Disabling inbound IPv6"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:378
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:387
 msgid "Enabling inbound IPv6"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:386
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:395
 msgid "Disabling UDP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:388
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:397
 msgid "Enabling UDP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:395
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:404
 msgid "Requiring SSU introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:453
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:462
 msgid "Invalid address"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:459
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:468
 #, java-format
 msgid "The hostname or IP {0} is not publicly routable"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:484
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:493
 msgid "Updating bandwidth share percentage"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:514
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:513
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:528
+msgid "Invalid bandwidth"
+msgstr ""
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHandler.java:533
 msgid "Updated bandwidth limits"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:229
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHelper.java:239
 msgid "Add host name or IP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:252
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHelper.java:266
 msgid "bits per second"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:253
+#: ../java/src/net/i2p/router/web/helpers/ConfigNetHelper.java:267
 #, java-format
 msgid "or {0} bytes per month maximum"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:20
+#: ../java/src/net/i2p/router/web/helpers/ConfigPeerHandler.java:21
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:550
 msgid "Ban peer until restart"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:23
+#: ../java/src/net/i2p/router/web/helpers/ConfigPeerHandler.java:24
 #, java-format
 msgid "Manually banned via {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:24
-#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:33
-#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:35
-#: ../java/src/net/i2p/router/web/PeerHelper.java:129
-#: ../java/src/net/i2p/router/web/PeerHelper.java:188
-#: ../java/src/net/i2p/router/web/PeerHelper.java:347
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:209
+#: ../java/src/net/i2p/router/web/helpers/ConfigPeerHandler.java:25
+#: ../java/src/net/i2p/router/web/helpers/ConfigPeerHandler.java:34
+#: ../java/src/net/i2p/router/web/helpers/ConfigPeerHandler.java:36
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:130
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:189
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:348
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:92
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:211
 msgid "Peer"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:24
+#: ../java/src/net/i2p/router/web/helpers/ConfigPeerHandler.java:25
 msgid "banned until restart"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:27
-#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:38
-#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:59
+#: ../java/src/net/i2p/router/web/helpers/ConfigPeerHandler.java:28
+#: ../java/src/net/i2p/router/web/helpers/ConfigPeerHandler.java:39
+#: ../java/src/net/i2p/router/web/helpers/ConfigPeerHandler.java:60
 msgid "Invalid peer"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:28
+#: ../java/src/net/i2p/router/web/helpers/ConfigPeerHandler.java:29
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:552
 msgid "Unban peer"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:33
+#: ../java/src/net/i2p/router/web/helpers/ConfigPeerHandler.java:34
 msgid "unbanned"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:35
+#: ../java/src/net/i2p/router/web/helpers/ConfigPeerHandler.java:36
 msgid "is not currently banned"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:39
+#: ../java/src/net/i2p/router/web/helpers/ConfigPeerHandler.java:40
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:578
 msgid "Adjust peer bonuses"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:47
+#: ../java/src/net/i2p/router/web/helpers/ConfigPeerHandler.java:48
 msgid "Bad speed value"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:52
+#: ../java/src/net/i2p/router/web/helpers/ConfigPeerHandler.java:53
 msgid "Bad capacity value"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:61
+#: ../java/src/net/i2p/router/web/helpers/ConfigPeerHandler.java:62
 msgid "Unsupported"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:24
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:651
+#: ../java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java:28
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:549
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:730
 msgid "Save changes and reseed now"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:27
-#: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:49
+#: ../java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java:31
+#: ../java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java:55
 msgid "Reseeding is already in progress"
 msgstr ""
 
 #. skip the nonce checking in ReseedHandler
-#: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:30
+#: ../java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java:35
 msgid "Starting reseed process"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:32
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:543
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:549
+#: ../java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java:37
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:569
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:579
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:585
 msgid "Reseed from URL"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:37
+#: ../java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java:43
 msgid "You must enter a URL"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:66
+#: ../java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java:68
 msgid "Reseed in progress, check summary bar for status"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:68
+#: ../java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java:70
 msgid "Reseed complete, check summary bar for status"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:74
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:557
+#: ../java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java:77
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:561
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:593
 msgid "Reseed from file"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:84
-#: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:91
+#: ../java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java:88
+#: ../java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java:96
 msgid "Reseed from file failed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:86
+#: ../java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java:91
 #, java-format
 msgid "Reseed successful, loaded {0} router info from file"
 msgid_plural "Reseed successful, loaded {0} router infos from file"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:99
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:599
+#: ../java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java:105
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:639
 msgid "Reset URL list"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:107
+#: ../java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java:131
 msgid "URL list reset successfully"
 msgstr ""
 
-#. Normal browsers send value, IE sends button label
-#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:34
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:232
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:236
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:531
-msgid "Shutdown immediately"
-msgstr ""
-
 #. ctx.router().shutdown(Router.EXIT_HARD); // never returns
 #. give the UI time to respond
-#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:39
+#: ../java/src/net/i2p/router/web/helpers/ConfigRestartBean.java:42
 msgid "Cancel shutdown"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:40
+#: ../java/src/net/i2p/router/web/helpers/ConfigRestartBean.java:43
 msgid "Cancel restart"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:42
+#: ../java/src/net/i2p/router/web/helpers/ConfigRestartBean.java:45
 msgid "Restart immediately"
 msgstr ""
 
-#. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns
-#. give the UI time to respond
-#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47
-#: ../java/src/net/i2p/router/web/SummaryRenderer.java:249
-#: ../java/src/net/i2p/router/web/SummaryRenderer.java:252
-msgid "Restart"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:51
+#: ../java/src/net/i2p/router/web/helpers/ConfigRestartBean.java:54
 msgid "Shutdown"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:65
+#: ../java/src/net/i2p/router/web/helpers/ConfigRestartBean.java:68
 msgid "Restart imminent"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:67
+#: ../java/src/net/i2p/router/web/helpers/ConfigRestartBean.java:70
 msgid "Shutdown imminent"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:71
+#: ../java/src/net/i2p/router/web/helpers/ConfigRestartBean.java:74
 #, java-format
 msgid "Shutdown in {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:74
-#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:85
+#: ../java/src/net/i2p/router/web/helpers/ConfigRestartBean.java:77
+#: ../java/src/net/i2p/router/web/helpers/ConfigRestartBean.java:88
 #, java-format
 msgid "Please wait for routing commitment to expire for {0} tunnel"
 msgid_plural "Please wait for routing commitments to expire for {0} tunnels"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:82
+#: ../java/src/net/i2p/router/web/helpers/ConfigRestartBean.java:85
 #, java-format
 msgid "Restart in {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:529
-msgid "Shutdown gracefully"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:231
-msgid "Graceful shutdown initiated"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:237
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:535
-msgid "Cancel graceful shutdown"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:239
-msgid "Graceful shutdown cancelled"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:240
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:551
-msgid "Graceful restart"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:245
-msgid "Graceful restart requested"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:246
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:553
-msgid "Hard restart"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:251
-msgid "Hard restart requested"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:252
-msgid "Rekey and Restart"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:253
-msgid "Rekeying after graceful restart"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:256
-msgid "Rekey and Shutdown"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:257
-msgid "Rekeying after graceful shutdown"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:260
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:586
-msgid "Run I2P on startup"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:262
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:588
-msgid "Don't run I2P on startup"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:264
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:612
-msgid "Dump threads"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:271
-#, java-format
-msgid "Threads dumped to {0}"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:272
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:620
-msgid "View console on startup"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:274
-msgid "Console is to be shown on startup"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:275
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:622
-msgid "Do not view console on startup"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:277
-msgid "Console is not to be shown on startup"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:278
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:608
-msgid "Force GC"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:280
-msgid "Full garbage collection requested"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:281
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:565
-msgid "Show systray icon"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:283
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:569
-msgid "Hide systray icon"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:293
-msgid "Service installed"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:295
-msgid "Warning: unable to install the service"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:302
-msgid "Service removed"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:304
-msgid "Warning: unable to remove the service"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:343
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:358
-msgid "Enabled system tray"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:348
-msgid "Disabled system tray"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:363
-msgid "Failed to start systray"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:365
-msgid "Failed to stop systray"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:118
+#: ../java/src/net/i2p/router/web/helpers/ConfigStatsHandler.java:119
 msgid "Stat filter and location updated successfully to"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:121
+#: ../java/src/net/i2p/router/web/helpers/ConfigStatsHandler.java:122
 msgid "Full statistics enabled"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:123
+#: ../java/src/net/i2p/router/web/helpers/ConfigStatsHandler.java:124
 msgid "Full statistics disabled"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:127
+#: ../java/src/net/i2p/router/web/helpers/ConfigStatsHandler.java:128
 #, java-format
 msgid ""
 "Graph list updated, may take up to 60s to be reflected on the {0}Graphs "
 "Page{1}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:24
+#: ../java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java:27
 msgid "Save order"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:31
+#: ../java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java:34
 msgid "Refresh interval changed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:33
+#: ../java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java:36
 #, java-format
 msgid "Refresh interval must be at least {0} seconds"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:35
+#: ../java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java:38
 msgid "Refresh interval must be a number"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:38
+#: ../java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java:41
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:550
 msgid "Restore full default"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:40
+#: ../java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java:43
 msgid "Full summary bar default restored."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:41
-#: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:45
-#: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:137
+#: ../java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java:44
+#: ../java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java:48
+#: ../java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java:140
 msgid "Summary bar will refresh shortly."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:42
+#: ../java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java:45
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:552
 msgid "Restore minimal default"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:44
+#: ../java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java:47
 msgid "Minimal summary bar default restored."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:61
-#: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:83
-#: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:131
+#: ../java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java:64
+#: ../java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java:86
+#: ../java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java:134
 msgid "Order must be an integer"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:68
+#: ../java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java:71
 msgid "No section selected"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:73
+#: ../java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java:76
 msgid "No order entered"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:129
+#: ../java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java:132
 msgid "Moved"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:136
+#: ../java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java:139
 msgid "Saved order of sections."
 msgstr ""
 
 #. the count isn't really correct anyway, since we don't check for actual changes
 #. addFormNotice("Updated settings for " + updated + " pools.");
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:130
+#: ../java/src/net/i2p/router/web/helpers/ConfigTunnelsHandler.java:131
 msgid "Updated settings for all pools."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:135
+#: ../java/src/net/i2p/router/web/helpers/ConfigTunnelsHandler.java:136
 msgid "Exploratory tunnel configuration saved successfully."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:137
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:82
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:117
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:135
+#: ../java/src/net/i2p/router/web/helpers/ConfigTunnelsHandler.java:138
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHandler.java:87
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHandler.java:122
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHandler.java:140
 msgid ""
 "Error saving the configuration (applied but not saved) - please see the "
 "error logs."
 msgstr ""
 
 #. * dummies for translation
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:14
+#: ../java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java:15
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:15
+#: ../java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java:16
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:33
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:36
+#: ../java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java:34
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:39
 msgid "Exploratory tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:49
+#: ../java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java:52
 #, java-format
 msgid "Client tunnels for {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:78
+#: ../java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java:81
 msgid "ANONYMITY WARNING - Settings include 0-hop tunnels."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:83
+#: ../java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java:86
 msgid "ANONYMITY WARNING - Settings include 1-hop tunnels."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:86
+#: ../java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java:89
 msgid "PERFORMANCE WARNING - Settings include very long tunnels."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:89
+#: ../java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java:92
 msgid "PERFORMANCE WARNING - Settings include high tunnel quantities."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91
-#: ../java/src/net/i2p/router/web/PeerHelper.java:212
-#: ../java/src/net/i2p/router/web/PeerHelper.java:406
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:212
+#: ../java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java:94
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:213
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:407
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:245
 msgid "Inbound"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91
-#: ../java/src/net/i2p/router/web/PeerHelper.java:214
-#: ../java/src/net/i2p/router/web/PeerHelper.java:408
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:215
+#: ../java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java:94
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:215
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:409
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:248
 msgid "Outbound"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:97
+#: ../java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java:100
 msgid "Length"
 msgstr ""
 
 #. tunnel depth variance
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:114
+#: ../java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java:117
 msgid "Randomization"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:139
+#: ../java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java:142
 msgid "Quantity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:157
+#: ../java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java:160
 msgid "Backup quantity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:179
+#: ../java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java:182
 msgid "Inbound options"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:191
+#: ../java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java:194
 msgid "Outbound options"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:24
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHandler.java:29
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:533
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:539
 msgid "Add user"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:72
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHandler.java:77
 msgid "Theme change saved."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:74
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:79
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHandler.java:79
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHandler.java:84
 msgid "Refresh the page to view."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:77
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHandler.java:82
 msgid "Mobile console option saved."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:89
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHandler.java:94
 msgid "No user name entered"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:101
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHandler.java:106
 msgid ""
 "Warning: User names outside the ISO-8859-1 character set are not "
 "recommended. Support is not standardized and varies by browser."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:104
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHandler.java:109
 msgid "No password entered"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:113
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHandler.java:118
 #, java-format
 msgid ""
 "To recover from a forgotten or non-working password, stop I2P, edit the file "
 "{0}, delete the line {1}, and restart I2P."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:132
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHandler.java:137
 #, java-format
 msgid "Removed user {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:33
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHelper.java:39
 msgid "Set theme universally across all apps"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:45
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHelper.java:51
 msgid "Force the mobile console to be used"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:49
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHelper.java:55
 msgid ""
 "Enabling the Universal Themeing option is recommended when embedding these "
 "applications"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:54
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHelper.java:60
 msgid "Embed I2PSnark and I2PMail in the console"
 msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:199
-msgid "Add a user and password to enable."
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:203
-#: ../java/src/net/i2p/router/web/HomeHelper.java:213
-msgid "Mark for deletion"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:207
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configi2cp_jsp.java:595
-msgid "Username"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:224
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configi2cp_jsp.java:597
-msgid "Password"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167
-msgid "Update or check already in progress"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190
-msgid "Update available, attempting to download now"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192
-msgid "Update available, click button on left to download"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198
-msgid "No update available"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216
-#, java-format
-msgid "Updating news URL to {0}"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60
-msgid "internal"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227
-#, java-format
-msgid "Updating proxy host to {0}"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235
-#, java-format
-msgid "Updating proxy port to {0}"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251
-#, java-format
-msgid "Updating refresh frequency to {0}"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:126
-#: ../java/src/net/i2p/router/web/GraphHelper.java:400
-msgid "Never"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259
-#, java-format
-msgid "Updating update policy to {0}"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268
-msgid "Updating update URLs."
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280
-msgid "Updating trusted keys."
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292
-#, java-format
-msgid "Updating unsigned update URL to {0}"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304
-#, java-format
-msgid "Updating signed development build URL to {0}"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:128
-msgid "Every"
+
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHelper.java:204
+msgid "Add a user and password to enable."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:146
-msgid "Notify only"
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHelper.java:208
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:218
+msgid "Mark for deletion"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:153
-msgid "Download and verify only"
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHelper.java:212
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHelper.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configi2cp_jsp.java:595
+msgid "Username"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:161
-msgid "Download, verify, and restart"
+#: ../java/src/net/i2p/router/web/helpers/ConfigUIHelper.java:229
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configi2cp_jsp.java:597
+msgid "Password"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:34
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:36
 msgid "Aborted startup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:35
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:37
 msgid "Enabled floodfill"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:36
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:38
 msgid "Changed IP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:37
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:39
 msgid "Changed port"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:38
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:40
 msgid "Clock shifted"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:39
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:41
 msgid "Crashed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:40
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:42
 msgid "Critical error"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:41
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:43
 msgid "Installed new version"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:42
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:44
 msgid "Install failed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:43
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:45
 msgid "Network error"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:44
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:48
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:46
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:50
 msgid "New router identity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:45
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:47
 msgid "Disabled floodfill"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:46
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:48
 msgid "Out of memory error"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:47
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:49
 msgid "Reachability change"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:49
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:51
 msgid "Reseeded router"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:50
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:52
 msgid "Soft restart"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:51
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:53
 msgid "Started router"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:52
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:54
 msgid "Stopped router"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:53
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:55
 msgid "Updated router"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:54
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:56
 msgid "Watchdog warning"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:102
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:104
 msgid "Display Events"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:106
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:108
 msgid "Events since"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:111
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:113
 msgid "Event type"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:117
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:148
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:119
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:150
 msgid "All events"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:122
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:124
 msgid "Filter events"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:170
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:172
 msgid "No events found"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:171
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:173
 #, java-format
 msgid "No events found in previous {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:174
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:176
 #, java-format
 msgid "No \"{0}\" events found"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:175
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:177
 #, java-format
 msgid "No \"{0}\" events found in previous {1}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:179
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:154
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:181
+#: ../java/src/net/i2p/router/web/helpers/JobQueueHelper.java:155
 msgid "Time"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:182
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:184
 msgid "Event"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/EventLogHelper.java:184
+#: ../java/src/net/i2p/router/web/helpers/EventLogHelper.java:186
 msgid "Details"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/FormHandler.java:253
-msgid ""
-"Invalid form submission, probably because you used the 'back' or 'reload' "
-"button on your browser. Please resubmit."
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/FormHandler.java:255
-msgid ""
-"If the problem persists, verify that you have cookies enabled in your "
-"browser."
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/GraphHelper.java:168
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:172
 msgid "Combined bandwidth graph"
 msgstr ""
 
 #. e.g. "statname for 60m"
-#: ../java/src/net/i2p/router/web/GraphHelper.java:188
-#: ../java/src/net/i2p/router/web/GraphHelper.java:251
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:192
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:255
 #, java-format
 msgid "{0} for {1}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:238
-#: ../java/src/net/i2p/router/web/StatSummarizer.java:333
-msgid "Bandwidth usage"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/GraphHelper.java:253
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:257
 #, java-format
 msgid "ending {0} ago"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:255
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:260
 msgid "Return to main graphs page"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:270
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:275
 msgid "Larger"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:276
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:281
 msgid "Smaller"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:282
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:287
 msgid "Taller"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:288
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:293
 msgid "Shorter"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:294
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:299
 msgid "Wider"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:300
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:305
 msgid "Narrower"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:307
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:312
 msgid "Larger interval"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:313
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:318
 msgid "Smaller interval"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:320
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:325
 msgid "Previous interval"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:331
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:336
 msgid "Next interval"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:338
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:343
 msgid "Plot averages"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:338
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:343
 msgid "plot events"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:341
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:346
 msgid "All times are UTC."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:373
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:378
 msgid "Configure Graph Display"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:373
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:378
 msgid "Select Stats"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:377
-msgid "Display period"
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:383
+msgid ""
+"Note: Dimensions are for graph only (excludes title, labels and legend)."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:377
-msgid "minutes"
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:384
+msgid "Graph size"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:378
-msgid "Plot type"
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:385
+msgid "pixels wide"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:379
-msgid "Averages"
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:386
+msgid "pixels high"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:380
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:341
-msgid "Events"
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:388
+msgid "Display period"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:381
-msgid "Graph size"
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:388
+msgid "minutes"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:382
-msgid "pixels wide"
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:391
+msgid "Refresh delay"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:383
-msgid ""
-"Note: Dimensions are for graph only (excludes title, labels and legend)."
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:407
+msgid "Plot type"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:383
-msgid "pixels high"
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:408
+msgid "Averages"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:384
-msgid "Hide legend"
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:409
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:347
+msgid "Events"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:388
-msgid "Do not show legend on graphs"
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:410
+msgid "Hide legend"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:389
-msgid "Refresh delay"
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:415
+msgid "Do not show legend on graphs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:403
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:416
 msgid "Persistence"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:408
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:421
 msgid "Store graph data on disk"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:409
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:422
 msgid "Save settings and redraw graphs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/GraphHelper.java:467
+#: ../java/src/net/i2p/router/web/helpers/GraphHelper.java:480
 msgid "Graph settings saved"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:30
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:35
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:257
 msgid "Addressbook"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:30
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:35
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:255
 msgid "Manage your I2P hosts file here (I2P domain name resolution)"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:31
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:36
 msgid "Configure Bandwidth"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:31
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:36
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:390
 msgid "I2P Bandwidth Configuration"
 msgstr ""
 
 #. FIXME wasn't escaped
-#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:38
 msgid "Configure UI"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:33
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:38
 msgid "Select console theme & language & set optional console password"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:34
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:39
 msgid "Customize Home Page"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:34
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:39
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:408
 msgid "I2P Home Page Configuration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:35
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:40
 msgid "Customize Sidebar"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:35
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:40
 msgid "Customize the sidebar by adding or removing or repositioning elements"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:212
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:41
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:217
 msgid "Anonymous webmail client"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:36
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:41
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:219
 msgid "Email"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:37
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:42
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:271
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:237
 msgid "Help"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:37
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:42
 msgid "I2P Router Help"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:38
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:43
 msgid "Install and configure I2P plugins"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:38
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:43
 msgid "Manage Plugins"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:39
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:44
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:231
 msgid "Router Console"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:40
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:45
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:223
 msgid "Built-in anonymous BitTorrent Client"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:40
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:220
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:45
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:225
 msgid "Torrents"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:41
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:46
 msgid "Local web server for hosting your own content on I2P"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:41
-#: ../java/src/net/i2p/router/web/HomeHelper.java:181
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:46
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:186
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:235
 msgid "Web Server"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:46
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:51
 msgid "The Anoncoin project"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:47
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:52
 msgid "Bug tracker"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:47
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:52
 msgid "I2P Bug Reports"
 msgstr ""
 
 #. "colombo-bt.i2p" + S + _x("The Italian Bittorrent Resource") + S + "http://colombo-bt.i2p/" + S + I + "colomboicon.png" + S +
-#: ../java/src/net/i2p/router/web/HomeHelper.java:49
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:54
 msgid "Dev Forum"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:49
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:54
 msgid "Development forum"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:50
-#: ../java/src/net/i2p/router/web/HomeHelper.java:67
-msgid "Bittorrent tracker"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/HomeHelper.java:50
-msgid "diftracker"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/HomeHelper.java:51
+#. _x("diftracker") + S + _x("Bittorrent tracker") + S + "http://diftracker.i2p/" + S + I + "magnet.png" + S +
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:56
 msgid "I2P Applications"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:52
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:57
 msgid "Anonymous cryptocurrency exchange"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:53
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:58
 msgid "Frequently Asked Questions"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:53
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:58
 msgid "I2P FAQ"
 msgstr ""
 
 #. _x("I2P Forum") + S + _x("Community forum") + S + "http://forum.i2p/" + S + I + "group.png" + S +
-#: ../java/src/net/i2p/router/web/HomeHelper.java:55
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:60
 msgid ""
 "A public anonymous Git hosting site - supports pulling via Git and HTTP and "
 "pushing via SSH"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:57
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:62
 msgid "Anonymous wiki - share the knowledge"
 msgstr ""
 
 #. "hiddengate [ru]" + S + _x("Russian I2P-related wiki") + S + "http://hiddengate.i2p/" + S + I + "hglogo32.png" + S +
-#: ../java/src/net/i2p/router/web/HomeHelper.java:57
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:62
 msgid "I2P Wiki"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:63
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:68
 msgid "Free eepsite hosting with PHP and MySQL"
 msgstr ""
 
@@ -2966,339 +3074,316 @@ msgstr ""
 #. "jisko.i2p" + S + _x("Simple and fast microblogging website") + S + "http://jisko.i2p/" + S + I + "jisko_console_icon.png" + S +
 #. _x("Key Server") + S + _x("OpenPGP Keyserver") + S + "http://keys.i2p/" + S + I + "education.png" + S +
 #. "killyourtv.i2p" + S + _x("Debian and Tahoe-LAFS repositories") + S + "http://killyourtv.i2p/" + S + I + "television_delete.png" + S +
-#: ../java/src/net/i2p/router/web/HomeHelper.java:63
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:68
 msgid "Open4You"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:64
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:69
 msgid "Encrypted I2P Pastebin"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:64
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:69
 msgid "Pastebin"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:65
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:70
 msgid "I2P News"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:65
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:70
 msgid "Planet I2P"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:66
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:71
 msgid "Add-on directory"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:66
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:71
 msgid "I2P Plugins"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:67
-msgid "Postman's Tracker"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/HomeHelper.java:68
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:73
 msgid "I2P home page"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:68
+#. _x("Postman's Tracker") + S + _x("Bittorrent tracker") + S + "http://tracker2.postman.i2p/" + S + I + "magnet.png" + S +
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:73
 msgid "Project Website"
 msgstr ""
 
 #. _x("lenta news [ru]") + S + _x("Russian News Feed") + S + "http://lenta.i2p/" + S + I + "lenta_main_logo.png" + S +
 #. "Salt" + S + "salt.i2p" + S + "http://salt.i2p/" + S + I + "salt_console.png" + S +
-#: ../java/src/net/i2p/router/web/HomeHelper.java:71
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:76
 msgid "I2P Network Statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:72
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:77
 msgid "I2P Technical Docs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:72
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:77
 msgid "Technical documentation"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:73
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:78
 msgid "Privacy guides and tutorials"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:73
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:78
 msgid "The Tin Hat"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:74
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:79
 msgid "Trac Wiki"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:116
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:121
 msgid "The HTTP proxy is not up"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:118
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:123
 #, java-format
 msgid "Your browser is not properly configured to use the HTTP proxy at {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:217
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:1039
-msgid "Name"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/HomeHelper.java:219
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:224
 msgid "URL"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/HomeHelper.java:246
+#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:251
 msgid "Add"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52
+#: ../java/src/net/i2p/router/web/helpers/JobQueueHelper.java:53
 msgid "Job runners"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:58
+#: ../java/src/net/i2p/router/web/helpers/JobQueueHelper.java:59
 msgid "Active jobs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:62
+#: ../java/src/net/i2p/router/web/helpers/JobQueueHelper.java:63
 #, java-format
 msgid "started {0} ago"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68
+#: ../java/src/net/i2p/router/web/helpers/JobQueueHelper.java:69
 msgid "Just finished jobs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72
+#: ../java/src/net/i2p/router/web/helpers/JobQueueHelper.java:73
 #, java-format
 msgid "finished {0} ago"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:78
+#: ../java/src/net/i2p/router/web/helpers/JobQueueHelper.java:79
 msgid "Ready/waiting jobs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:97
+#: ../java/src/net/i2p/router/web/helpers/JobQueueHelper.java:98
 msgid "Scheduled jobs"
 msgstr ""
 
 #. translators: {0} is a job name, {1} is a time, e.g. 6 min
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:108
+#: ../java/src/net/i2p/router/web/helpers/JobQueueHelper.java:109
 #, java-format
 msgid "{0} will start in {1}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:123
+#: ../java/src/net/i2p/router/web/helpers/JobQueueHelper.java:124
 msgid "Total Job Statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:135
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:152
+#: ../java/src/net/i2p/router/web/helpers/JobQueueHelper.java:136
+#: ../java/src/net/i2p/router/web/helpers/JobQueueHelper.java:153
 msgid "Job"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:135
+#: ../java/src/net/i2p/router/web/helpers/JobQueueHelper.java:136
 msgid "Queued"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:152
+#: ../java/src/net/i2p/router/web/helpers/JobQueueHelper.java:153
 msgid "Runs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:153
+#: ../java/src/net/i2p/router/web/helpers/JobQueueHelper.java:154
 msgid "Dropped"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:154
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:156
-#: ../java/src/net/i2p/router/web/SummaryRenderer.java:221
-#: ../java/src/net/i2p/router/web/SummaryRenderer.java:234
-msgid "Avg"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:155
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:157
-#: ../java/src/net/i2p/router/web/SummaryRenderer.java:222
-#: ../java/src/net/i2p/router/web/SummaryRenderer.java:235
-msgid "Max"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:155
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:157
+#: ../java/src/net/i2p/router/web/helpers/JobQueueHelper.java:156
+#: ../java/src/net/i2p/router/web/helpers/JobQueueHelper.java:158
 msgid "Min"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:156
+#: ../java/src/net/i2p/router/web/helpers/JobQueueHelper.java:157
 msgid "Pending"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/JobQueueHelper.java:208
-#: ../java/src/net/i2p/router/web/NetDbHelper.java:19
+#: ../java/src/net/i2p/router/web/helpers/JobQueueHelper.java:209
+#: ../java/src/net/i2p/router/web/helpers/NetDbHelper.java:20
 msgid "Summary"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:78
-#: ../java/src/net/i2p/router/web/LogsHelper.java:134
+#: ../java/src/net/i2p/router/web/helpers/LogsHelper.java:71
+#: ../java/src/net/i2p/router/web/helpers/LogsHelper.java:96
 msgid "File location"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:131
+#: ../java/src/net/i2p/router/web/helpers/LogsHelper.java:93
 msgid "File not found"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/LogsHelper.java:149
+#: ../java/src/net/i2p/router/web/helpers/LogsHelper.java:111
 msgid "No log messages"
 msgstr ""
 
 #. 0
-#: ../java/src/net/i2p/router/web/NetDbHelper.java:20
+#: ../java/src/net/i2p/router/web/helpers/NetDbHelper.java:21
 msgid "Local Router"
 msgstr ""
 
 #. 1
-#: ../java/src/net/i2p/router/web/NetDbHelper.java:21
+#: ../java/src/net/i2p/router/web/helpers/NetDbHelper.java:22
 msgid "Router Lookup"
 msgstr ""
 
 #. 2
-#: ../java/src/net/i2p/router/web/NetDbHelper.java:22
+#: ../java/src/net/i2p/router/web/helpers/NetDbHelper.java:23
 msgid "All Routers"
 msgstr ""
 
 #. 3
-#: ../java/src/net/i2p/router/web/NetDbHelper.java:23
+#: ../java/src/net/i2p/router/web/helpers/NetDbHelper.java:24
 msgid "All Routers with Full Stats"
 msgstr ""
 
 #. 4
 #. 5
-#: ../java/src/net/i2p/router/web/NetDbHelper.java:25
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365
+#: ../java/src/net/i2p/router/web/helpers/NetDbHelper.java:26
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:371
 msgid "LeaseSets"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:207
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:800
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:208
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:801
 #: ../java/strings/Strings.java:69
 msgid "Router"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:216
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:217
 msgid "not found in network database"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:261
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:262
 msgid "Manually Configure Floodfill Participation"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:263
 msgid "Configure Floodfill Participation"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:296
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:297
 msgid "No Leasesets currently active."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:314
 msgid "LeaseSet"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:315
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:225
-msgid "Local"
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:316
+msgid "Encrypted"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:318
-msgid "Unpublished"
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:319
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:258
+msgid "Local"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:319
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:347
-msgid "Destination"
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:322
+msgid "Unpublished"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:341
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:356
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:345
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:360
 msgid "Add to addressbook"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:343
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:358
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:347
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:362
 msgid "Add to local addressbook"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:364
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:399
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:368
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:403
 #, java-format
 msgid "Expires in {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:366
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:401
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:370
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:405
 #, java-format
 msgid "Expired {0} ago"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:390
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:394
 msgid "Lease"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:391
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:392
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:192
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:395
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:396
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:225
 msgid "Gateway"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:394
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:398
 msgid "Tunnel"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:439
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:443
 msgid "Not initialized"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:496
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:500
 msgid "Network Database Router Statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:503
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:522
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:544
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:507
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:526
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:548
 msgid "Count"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:522
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:526
 msgid "Transports"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:544
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:548
 msgid "Country"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:610
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:797
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:614
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:798
 msgid "Our info"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:612
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:616
 msgid "Peer info for"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:621
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:625
 msgid "View extended router info"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:623
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:812
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:627
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:813
 msgid "Full entry"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:629
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:298
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:227
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:902
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:633
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:300
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:233
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:903
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:476
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:475
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:475
@@ -3307,759 +3392,717 @@ msgstr ""
 msgid "Hidden"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:629
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:902
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:633
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:903
 msgid "Updated"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:631
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:636
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:655
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:848
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:855
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:862
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:871
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:878
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:885
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:892
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:903
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:905
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:635
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:640
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:656
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:849
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:856
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:863
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:872
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:879
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:886
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:893
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:904
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:906
 #, java-format
 msgid "{0} ago"
 msgstr ""
 
 #. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:634
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:640
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:967
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:905
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:638
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:644
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:974
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:906
 msgid "Published"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:643
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:907
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:647
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:908
 msgid "Signing Key"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:646
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:650
 msgid "Address(es)"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:653
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:657
 msgid "cost"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:680
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:684
 msgid "Hidden or starting up"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:680
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:684
 msgid "SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:680
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:684
 msgid "SSU with introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:681
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:685
 msgid "NTCP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:681
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:685
 msgid "NTCP and SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:681
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:685
 msgid "NTCP and SSU with introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:682
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:686
 msgid "IPv6 Only SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:682
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:686
 msgid "IPv6 SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:682
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:686
 msgid "IPv6 SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:683
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:687
 msgid "IPv6 NTCP"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:683
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:687
 msgid "IPv6 NTCP, SSU"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:683
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:687
 msgid "IPv6 NTCP, SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:683
+#: ../java/src/net/i2p/router/web/helpers/NetDbRenderer.java:687
 msgid "IPv6 Only NTCP, SSU, introducers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/NewsHelper.java:293
-#, java-format
-msgid "News last updated {0} ago."
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/NewsHelper.java:299
-#, java-format
-msgid "News last checked {0} ago."
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/NewsHelper.java:308
-msgid "Hide news"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/NewsHelper.java:311
-msgid "Show news"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/NewsHelper.java:315
-msgid "Show all news"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/PeerHelper.java:97
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:98
 msgid "Router Transport Addresses"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:105
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:106
 #, java-format
 msgid "{0} is used for outbound connections only"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:123
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:124
 msgid ""
 "Your transport connection limits are automatically set based on your "
 "configured bandwidth."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:125
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:126
 msgid ""
 "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
 "i2np.udp.maxConnections=nnn on the advanced configuration page."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:127
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:283
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:128
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:285
 msgid "Definitions"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:129
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:130
 msgid "The remote peer, identified by router hash"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:130
-#: ../java/src/net/i2p/router/web/PeerHelper.java:190
-#: ../java/src/net/i2p/router/web/PeerHelper.java:351
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:131
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:191
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:352
 msgid "Dir"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:130
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:131
 msgid "Inbound connection"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:131
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:132
 msgid "Outbound connection"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:132
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:133
 msgid "They offered to introduce us (help other peers traverse our firewall)"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:133
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:134
 msgid "We offered to introduce them (help other peers traverse their firewall)"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:134
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:135
 msgid "How long since a packet has been received / sent"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:134
-#: ../java/src/net/i2p/router/web/PeerHelper.java:192
-#: ../java/src/net/i2p/router/web/PeerHelper.java:353
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:135
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:193
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:354
 msgid "Idle"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:135
-#: ../java/src/net/i2p/router/web/PeerHelper.java:193
-#: ../java/src/net/i2p/router/web/PeerHelper.java:358
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:191
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:136
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:194
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:359
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:224
 msgid "In/Out"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:135
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:136
 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:136
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:137
 msgid "How long ago this connection was established"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:136
-#: ../java/src/net/i2p/router/web/PeerHelper.java:194
-#: ../java/src/net/i2p/router/web/PeerHelper.java:363
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:1072
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:137
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:195
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:364
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:1104
 msgid "Up"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:137
-#: ../java/src/net/i2p/router/web/PeerHelper.java:195
-#: ../java/src/net/i2p/router/web/PeerHelper.java:365
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:138
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:196
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:366
 msgid "Skew"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:137
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:138
 msgid "The difference between the peer's clock and your own"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:138
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:139
 msgid ""
 "The congestion window, which is how many bytes can be sent without an "
 "acknowledgement"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:139
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:140
 msgid "The number of sent messages awaiting acknowledgement"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:140
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:141
 msgid "The maximum number of concurrent messages to send"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:141
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:142
 msgid "The number of pending sends which exceed congestion window"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:142
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:143
 msgid "The slow start threshold"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:143
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:144
 msgid "The round trip time in milliseconds"
 msgstr ""
 
 #. .append("<tr><td><b id=\"def.dev\">").append(_t("Dev")).append("</b></td><td>").append(_t("The standard deviation of the round trip time in milliseconds")).append("</td></tr>\n")
-#: ../java/src/net/i2p/router/web/PeerHelper.java:145
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:146
 msgid "The retransmit timeout in milliseconds"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:146
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:147
 msgid ""
 "Current maximum send packet size / estimated maximum receive packet size "
 "(bytes)"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:147
-#: ../java/src/net/i2p/router/web/PeerHelper.java:196
-#: ../java/src/net/i2p/router/web/PeerHelper.java:382
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:148
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:197
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:383
 msgid "TX"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:147
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:148
 msgid "The total number of messages sent to the peer"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:148
-#: ../java/src/net/i2p/router/web/PeerHelper.java:197
-#: ../java/src/net/i2p/router/web/PeerHelper.java:384
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:149
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:198
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:385
 msgid "RX"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:148
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:149
 msgid "The total number of messages received from the peer"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:149
-#: ../java/src/net/i2p/router/web/PeerHelper.java:387
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:150
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:388
 msgid "Dup TX"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:149
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:150
 msgid "The total number of packets retransmitted to the peer"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:150
-#: ../java/src/net/i2p/router/web/PeerHelper.java:389
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:151
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:390
 msgid "Dup RX"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:150
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:151
 msgid "The total number of duplicate packets received from the peer"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:180
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:181
 msgid "NTCP connections"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:181
-#: ../java/src/net/i2p/router/web/PeerHelper.java:340
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:182
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:341
 msgid "Limit"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:189
-#: ../java/src/net/i2p/router/web/PeerHelper.java:351
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:190
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:352
 msgid "Direction/Introduction"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:191
-#: ../java/src/net/i2p/router/web/PeerHelper.java:352
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:192
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:353
 msgid "IPv6"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:198
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:199
 msgid "Out Queue"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:199
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:200
 msgid "Backlogged?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:199
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:200
 msgid "Is peer backlogged?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:269
-#: ../java/src/net/i2p/router/web/PeerHelper.java:574
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:270
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:575
 #, java-format
 msgid "{0} peer"
 msgid_plural "{0} peers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:339
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:340
 msgid "UDP connections"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:349
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:350
 msgid "Sort by peer hash"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:354
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:355
 msgid "Sort by idle inbound"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:356
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:357
 msgid "Sort by idle outbound"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:359
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:360
 msgid "Sort by inbound rate"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:361
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:362
 msgid "Sort by outbound rate"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:364
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:365
 msgid "Sort by connection uptime"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:366
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:367
 msgid "Sort by clock skew"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:369
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:370
 msgid "Sort by congestion window"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:371
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:372
 msgid "Sort by slow start threshold"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:374
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:375
 msgid "Sort by round trip time"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:378
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:379
 msgid "Sort by retransmission timeout"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:381
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:382
 msgid "Sort by outbound maximum transmit unit"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:383
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:384
 msgid "Sort by packets sent"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:385
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:386
 msgid "Sort by packets received"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:388
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:389
 msgid "Sort by packets retransmitted"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:390
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:391
 msgid "Sort by packets received more than once"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:410
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:411
 msgid "We offered to introduce them"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:412
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:413
 msgid "They offered to introduce us"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:424
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:425
 msgid "1 fail"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:426
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:427
 #, java-format
 msgid "{0} fails"
 msgstr ""
 
 #. 1
-#: ../java/src/net/i2p/router/web/PeerHelper.java:432
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:172
-#: ../java/src/net/i2p/router/web/ProfilesHelper.java:13
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:733
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:433
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:174
+#: ../java/src/net/i2p/router/web/helpers/ProfilesHelper.java:15
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:740
 msgid "Banned"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PeerHelper.java:491
+#: ../java/src/net/i2p/router/web/helpers/PeerHelper.java:492
 msgid "backlogged"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/PluginStarter.java:157
-msgid "Checking for plugin updates"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/PluginStarter.java:172
-#: ../java/src/net/i2p/router/web/PluginStarter.java:178
-msgid "Plugin update check failed"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/PluginStarter.java:216
-#, java-format
-msgid "1 plugin updated"
-msgid_plural "{0} plugins updated"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../java/src/net/i2p/router/web/PluginStarter.java:218
-msgid "Plugin update check complete"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:82
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:84
 #, java-format
 msgid "Showing 1 recent profile."
 msgid_plural "Showing {0} recent profiles."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:84
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:86
 #, java-format
 msgid "Hiding 1 older profile."
 msgid_plural "Hiding {0} older profiles."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:86
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:88
 #, java-format
 msgid "Hiding 1 standard profile."
 msgid_plural "Hiding {0} standard profiles."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:93
 msgid "Groups"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:210
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:94
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:212
 msgid "Caps"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:94
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:96
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:273
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:570
 msgid "Speed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:95
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:97
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:574
 msgid "Capacity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:96
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:98
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:277
 msgid "Integration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:98
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:100
 msgid "View/Edit"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:137
 msgid "Fast, High Capacity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:136
-#: ../java/src/net/i2p/router/web/ProfilesHelper.java:11
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:138
+#: ../java/src/net/i2p/router/web/helpers/ProfilesHelper.java:13
 msgid "High Capacity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:137
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:139
 msgid "Standard"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:138
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:173
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:724
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:140
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:175
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:731
 msgid "Failing"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:140
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:641
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:704
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:142
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:647
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:711
 msgid "Integrated"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:174
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:314
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:176
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:316
 msgid "Unreachable"
 msgstr ""
 
 #. hide if < 10%
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:184
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:186
 msgid "Test Fails"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:191
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:193
 msgid "profile"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:192
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:194
 msgid "Configure peer"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:211
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:213
 msgid "Integ. Value"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:212
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:214
 msgid "Last Heard About"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:213
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:215
 msgid "Last Heard From"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:214
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:216
 msgid "Last Good Send"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:215
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:217
 msgid "Last Bad Send"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:216
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:218
 msgid "10m Resp. Time"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:217
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:219
 msgid "1h Resp. Time"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:218
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:220
 msgid "1d Resp. Time"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:219
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:221
 msgid "Last Good Lookup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:220
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:222
 msgid "Last Bad Lookup"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:221
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:223
 msgid "Last Good Store"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:222
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:224
 msgid "Last Bad Store"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:223
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:225
 msgid "1h Fail Rate"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:224
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:226
 msgid "1d Fail Rate"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:270
 msgid "Thresholds"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:279
 msgid "fast peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:281
 msgid "high capacity peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:283
 msgid " well integrated peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:286
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:288
 msgid "as determined by the profile organizer"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:286
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:288
 msgid "groups"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:289
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:291
 msgid "capabilities in the netDb, not used to determine profiles"
 msgstr ""
 
 #. capabilities
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:289
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:291
 #: ../java/strings/Strings.java:82
 msgid "caps"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:293
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:295
 msgid "SSU Testing"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:294
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:296
 msgid "SSU Introducer"
 msgstr ""
 
 #. 0
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:297
-#: ../java/src/net/i2p/router/web/ProfilesHelper.java:12
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:299
+#: ../java/src/net/i2p/router/web/helpers/ProfilesHelper.java:14
 msgid "Floodfill"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:301
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:303
 #, java-format
 msgid "Under {0} shared bandwidth"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:302
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:305
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:306
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:309
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:310
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:151
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:152
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:155
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:156
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:159
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:304
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:307
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:308
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:311
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:312
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:179
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:180
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:183
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:184
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:187
 #, java-format
 msgid "{0} shared bandwidth"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:313
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:315
 msgid "Reachable"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:317
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:160
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:319
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:188
 #, java-format
 msgid "Over {0} shared bandwidth"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:319
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:321
 msgid ""
 "Note: For P and X bandwidth tiers, O is included for the purpose of backward "
 "compatibility in the NetDB."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:323
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:325
 msgid "speed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:325
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:327
 msgid ""
 "peak throughput (bytes per second) over a 1 minute period that the peer has "
 "sustained in a single tunnel"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:328
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:330
 msgid "capacity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:330
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:332
 msgid "how many tunnels can we ask them to join in an hour?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:333
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:335
 msgid "integration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:335
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:337
 msgid "how many new peers have they told us about lately?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:338
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:340
 msgid "status"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:340
+#: ../java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java:342
 msgid "is the peer banned, or unreachable, or failing tunnel tests?"
 msgstr ""
 
 #. 2
-#: ../java/src/net/i2p/router/web/ProfilesHelper.java:14
+#: ../java/src/net/i2p/router/web/helpers/ProfilesHelper.java:16
 msgid "All"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SearchHelper.java:76
+#: ../java/src/net/i2p/router/web/helpers/SearchHelper.java:77
 msgid "Select search engine"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:36
+#: ../java/src/net/i2p/router/web/helpers/StatsGenerator.java:37
 msgid "Statistics gathered during this router's uptime"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:39
+#: ../java/src/net/i2p/router/web/helpers/StatsGenerator.java:40
 msgid ""
 "The data gathered is quantized over a 1 minute period, so should just be "
 "used as an estimate."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:40
+#: ../java/src/net/i2p/router/web/helpers/StatsGenerator.java:41
 msgid "These statistics are primarily used for development and debugging."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:44
+#: ../java/src/net/i2p/router/web/helpers/StatsGenerator.java:45
 msgid "Jump to section"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:67
+#: ../java/src/net/i2p/router/web/helpers/StatsGenerator.java:68
 msgid "GO"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:109
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:160
+#: ../java/src/net/i2p/router/web/helpers/StatsGenerator.java:110
+#: ../java/src/net/i2p/router/web/helpers/StatsGenerator.java:161
 msgid "No lifetime events"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:120
+#: ../java/src/net/i2p/router/web/helpers/StatsGenerator.java:121
 msgid "frequency"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:124
+#: ../java/src/net/i2p/router/web/helpers/StatsGenerator.java:125
 msgid "Rolling average events per period"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:128
+#: ../java/src/net/i2p/router/web/helpers/StatsGenerator.java:129
 msgid "Highest events per period"
 msgstr ""
 
@@ -4070,624 +4113,624 @@ msgstr ""
 #. }
 #. buf.append(" <i>avg interval between updates:</i> (").append(num(curFreq.getAverageInterval())).append("ms, min ");
 #. buf.append(num(curFreq.getMinAverageInterval())).append("ms)");
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:139
+#: ../java/src/net/i2p/router/web/helpers/StatsGenerator.java:140
 msgid "Lifetime average events per period"
 msgstr ""
 
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:144
+#: ../java/src/net/i2p/router/web/helpers/StatsGenerator.java:145
 msgid "Lifetime average frequency"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:147
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:240
+#: ../java/src/net/i2p/router/web/helpers/StatsGenerator.java:148
+#: ../java/src/net/i2p/router/web/helpers/StatsGenerator.java:241
 #, java-format
 msgid "1 event"
 msgid_plural "{0} events"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:172
+#: ../java/src/net/i2p/router/web/helpers/StatsGenerator.java:173
 msgid "rate"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:174
+#: ../java/src/net/i2p/router/web/helpers/StatsGenerator.java:175
 msgid "Average"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:177
+#: ../java/src/net/i2p/router/web/helpers/StatsGenerator.java:178
 msgid "Highest average"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:205
+#: ../java/src/net/i2p/router/web/helpers/StatsGenerator.java:206
 #, java-format
 msgid "There was 1 event in this period."
 msgid_plural "There were {0} events in this period."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:207
+#: ../java/src/net/i2p/router/web/helpers/StatsGenerator.java:208
 #, java-format
 msgid "The period ended {0} ago."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:210
+#: ../java/src/net/i2p/router/web/helpers/StatsGenerator.java:211
 msgid "No events"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:215
+#: ../java/src/net/i2p/router/web/helpers/StatsGenerator.java:216
 msgid "Average event count"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:217
+#: ../java/src/net/i2p/router/web/helpers/StatsGenerator.java:218
 msgid "Events in peak period"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:225
+#: ../java/src/net/i2p/router/web/helpers/StatsGenerator.java:226
 msgid "Graph Data"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:228
+#: ../java/src/net/i2p/router/web/helpers/StatsGenerator.java:229
 msgid "Graph Event Count"
 msgstr ""
 
 #. Display the strict average
-#: ../java/src/net/i2p/router/web/StatsGenerator.java:237
+#: ../java/src/net/i2p/router/web/helpers/StatsGenerator.java:238
 msgid "Lifetime average value"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:147
 msgid "I2P Router Help &amp; FAQ"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:149
 msgid "Help &amp; FAQ"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:155
 msgid "A guide to some of the less-used configuration settings"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:157
 msgid "Advanced Settings"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:156
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:161
 msgid "Recent development changes to the router"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:158
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:329
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:163
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:334
 msgid "Changelog"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:167
 msgid "An introduction to configuring your router"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:169
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:235
 msgid "Configuration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:173
 msgid "A shortened version of the official Frequently Asked Questions"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:170
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:175
 msgid "FAQ"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:179
 msgid "Information regarding software and licenses used by I2P"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:176
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:181
 msgid "Legal"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:185
 msgid "A short guide to the sidebar's network reachability notification"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:182
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:187
 msgid "Reachability"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:191
 msgid "An introduction to the router sidebar"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:188
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:193
 msgid "Sidebar"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:197
 msgid "Troubleshooting &amp; Further Assistance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:199
 msgid "Troubleshoot"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:204
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:209
 msgid ""
 "Configure startup of clients and webapps (services); manually start dormant "
 "services"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:206
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:211
 msgid "I2P Services"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:233
 msgid "Local web server"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:242
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:247
 msgid "Configure I2P Router"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:249
 msgid "I2P Internals"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:257
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:262
 msgid "Graph router performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:264
 msgid "Graphs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:269
 msgid "Router Help and FAQ"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:532
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:275
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:564
 msgid "Local Tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:272
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:277
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:232
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:397
 msgid "Hidden Services Manager"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:281
 msgid "Health Report"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:283
 msgid "Logs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:282
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:287
 msgid "Show list of all known I2P routers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:284
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:289
 msgid "NetDB"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:600
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:663
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:293
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:606
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:670
 msgid "Show all current peer connections"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:294
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:299
 msgid "Show recent peer performance profiles"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:301
 msgid "Profiles"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:300
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:813
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:305
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:820
 msgid "View existing tunnels and tunnel build status"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:313
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:318
 msgid "Advanced Configuration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:326
 msgid "Review active encryption certificates used in console"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:328
 msgid "Certs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:327
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:332
 msgid "View full changelog"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:333
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:338
 msgid "View router debug information"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:335
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:340
 msgid "Debug"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:345
 msgid "View historical log of router events"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:351
 msgid "Review extended info about installed .jar and .war files"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:347
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:353
 msgid "Jars"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:359
 msgid "Documentation for the I2P API"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:357
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:363
 msgid "Show the router's workload, and how it's performing"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:359
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:365
 msgid "Jobs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:363
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:369
 msgid "View active leasesets (debug mode)"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:369
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:375
 msgid "Network database search tool"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:371
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:377
 msgid "NetDB Search"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:375
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:381
 msgid "Signed proof of ownership of this router"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:383
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:218
 msgid "Proof"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:387
 msgid "Textual router performance statistics"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:387
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:393
 msgid "Review possible sybils in network database"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:389
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:395
 msgid "Sybils"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:400
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:460
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:406
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:466
 #, java-format
 msgid ""
 "Your Local Identity [{0}] is your unique I2P router identity, similar to an "
 "IP address but tailored to I2P. "
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:401
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:461
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:407
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:467
 msgid "Never disclose this to anyone, as it can reveal your real world IP."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:463
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:409
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:469
 msgid "Router Info"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:434
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:468
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:414
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:440
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:474
 msgid "The version of the I2P software we are running"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:444
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:478
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:424
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:450
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:484
 msgid "How long we've been running for this session"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:488
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:494
 msgid "Difference between network-synced time and local time"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:497
 msgid "Clock Skew"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:506
 msgid ""
 "How much RAM I2P is using / total RAM available to I2P (excludes RAM "
 "allocated to the JVM)"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:501
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:509
 msgid "Memory"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:549
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:555
 msgid ""
 "Help with configuring your firewall and router for optimal I2P performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:566
 msgid "See more information on the wiki"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:562
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:568
 msgid "Warning: ECDSA is not available. Update your Java or OS"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:573
 #, java-format
 msgid "Warning: Java version {0} is no longer supported by I2P."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:569
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:575
 #, java-format
 msgid "Update Java to version {0} or higher to receive I2P updates."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:581
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:587
 msgid "Configure I2P Updates"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:583
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:589
 msgid "I2P Update"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:671
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:614
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:678
 msgid "Peers we've been talking to in the last few minutes/last hour"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:611
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:674
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:617
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:681
 msgid "Active"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:620
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:683
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:626
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:690
 msgid "The number of peers available for building client tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:623
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:686
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:629
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:693
 msgid "Fast"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:629
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:692
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:635
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:699
 msgid "The number of peers available for building exploratory tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:632
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:695
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:638
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:702
 msgid "High capacity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:638
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:701
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:644
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:708
 msgid "The number of peers available for network database inquiries"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:710
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:653
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:717
 msgid "The total number of peers in our network database"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:713
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:656
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:720
 msgid "Known"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:721
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:728
 msgid "The number of peers failing network tests"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:730
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:737
 msgid "The number of banned peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:754
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:761
 msgid "Configure router bandwidth allocation"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:756
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:763
 msgid "Bandwidth in/out"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:776
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:783
 msgid "Total"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:783
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:790
 msgid "Used"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:801
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:808
 msgid "Our inbound &amp; outbound traffic for the last 20 minutes"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:820
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:827
 msgid ""
 "Used for building and testing tunnels, and communicating with floodfill peers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:823
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:830
 msgid "Exploratory"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:829
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:836
 msgid "Tunnels we are using to provide or access services on the network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:838
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:845
 msgid ""
 "Tunnels we are participating in, directly contributing bandwidth to the "
 "network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:841
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:848
 msgid "Participating"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:847
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:854
 msgid ""
 "The ratio of tunnel hops we provide to tunnel hops we use - a value greater "
 "than 1.00 indicates a positive contribution to the network"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:850
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:857
 msgid "Share ratio"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:863
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:870
 msgid "What's in the router's job queue?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:865
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:872
 msgid "Congestion"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:870
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:877
 msgid "Indicates router performance"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:873
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:880
 msgid "Job lag"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:879
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:886
 msgid "Indicates how quickly outbound messages to other I2P routers are sent"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:882
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:889
 msgid "Message delay"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:889
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:896
 msgid "Round trip time for a tunnel test"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:892
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:899
 msgid "Tunnel lag"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:899
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:906
 msgid "Queued requests from other routers to participate in tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:902
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:909
 msgid "Backlog"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:938
+#: ../java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java:945
 msgid "News &amp; Updates"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:218
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:224
 msgid "ERR-Client Manager I2CP Error - check logs"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:225
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:231
 #, java-format
 msgid "ERR-Clock Skew of {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:246
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:252
 msgid "ERR-Unresolved TCP Address"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:250
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:256
 msgid "ERR-Private TCP Address"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:254
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:260
 msgid "ERR-SymmetricNAT"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:260
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:266
 msgid "WARN-Firewalled with Inbound TCP Enabled"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:265
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:271
 msgid "WARN-Firewalled and Floodfill"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:271
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:277
 msgid "Disconnected - check network connection"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:274
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:280
 msgid ""
 "ERR-UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and "
 "restart"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:284
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:290
 msgid "ERR-No Active Peers, Check Network Connection and Firewall"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:287
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:293
 msgid "ERR-UDP Disabled and Inbound TCP host/port not set"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:289
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:295
 msgid "WARN-Firewalled with UDP Disabled"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:531
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:563
 msgid "Add/remove/edit &amp; control your client and server tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:544
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:576
 msgid "Hidden Service"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:548
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:580
 msgid "Show tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:560
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:592
 msgid "Leases expired"
 msgstr ""
 
 #. red or yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:560
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:561
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:592
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:593
 msgid "Rebuilding"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:561
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:593
 msgid "ago"
 msgstr ""
 
 #. green light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:564
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:596
 msgid "Ready"
 msgstr ""
 
 #. yellow light
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:568
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:600
 msgid "Building"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:568
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:600
 msgid "Building tunnels"
 msgstr ""
 
@@ -4695,35 +4738,35 @@ msgstr ""
 #. nicely under 'local destinations' in the summary bar
 #. note that if the wording changes in i2ptunnel.config, we have to
 #. keep the old string here as well for existing installs
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:583
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:615
 #: ../java/strings/Strings.java:36
 msgid "shared clients"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:811
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:843
 msgid "Click Restart to install"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:813
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:845
 msgid "Click Shutdown and restart to install"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:814
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:831
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:843
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:855
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:846
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:863
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:875
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:887
 #, java-format
 msgid "Version {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:830
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:842
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:854
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:862
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:874
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:886
 msgid "Update available"
 msgstr ""
 
 #. Note to translators: parameter is a version, e.g. "0.8.4"
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:878
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:910
 #, java-format
 msgid "Download {0} Update"
 msgstr ""
@@ -4731,7 +4774,7 @@ msgstr ""
 #. Note to translators: parameter is a router version, e.g. "0.9.19-16"
 #. <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/SummaryHelper.java:886
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:918
 #, java-format
 msgid "Download Signed<br>Development Update<br>{0}"
 msgstr ""
@@ -4739,236 +4782,221 @@ 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/SummaryHelper.java:894
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:926
 #, java-format
 msgid "Download Unsigned<br>Update {0}"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:918
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:950
 msgid "Help with firewall configuration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:920
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:952
 msgid "Check network connection and NAT/firewall"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:939
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:978
 msgid ""
 "Attempt to download router reference files (if automatic reseed has failed)"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:940
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:979
 msgid "Reseed"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:1041
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:1073
 msgid "Order"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:1062
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:1094
 msgid "Top"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:1067
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:1099
 msgid "Move to top"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:1077
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:1109
 msgid "Move up"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:1085
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:1117
 msgid "Down"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:1090
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:1122
 msgid "Move down"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:1095
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:1127
 msgid "Bottom"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:1100
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:1132
 msgid "Move to bottom"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:1111
+#: ../java/src/net/i2p/router/web/helpers/SummaryHelper.java:1143
 msgid "Select a section to add"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/SummaryRenderer.java:187
-#, java-format
-msgid "events in {0}"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189
-#, java-format
-msgid "averaged for {0}"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/SummaryRenderer.java:199
-msgid "Events per period"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/SummaryRenderer.java:223
-#: ../java/src/net/i2p/router/web/SummaryRenderer.java:236
-msgid "Now"
-msgstr ""
-
-#: ../java/src/net/i2p/router/web/SybilRenderer.java:910
+#: ../java/src/net/i2p/router/web/helpers/SybilRenderer.java:911
 msgid "Addresses"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:36
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:39
 msgid "Configure tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:36
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:60
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:39
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:68
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:84
 msgid "configure"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:58
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:66
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:82
 msgid "Client tunnels for"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:60
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:68
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:84
 msgid "Configure tunnels for session"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:62
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:70
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:86
 msgid "dead"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:67
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:95
 msgid "Participating tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:101
 msgid "Receive on"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:74
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:102
 msgid "Expiration"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:74
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:102
 msgid "Send on"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:75
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:103
 msgid "Rate"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:75
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:103
 msgid "Role"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:75
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:192
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:103
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:225
 msgid "Usage"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:96
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:105
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:226
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:231
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:124
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:133
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:259
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:264
 msgid "Tunnel identity"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:116
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:144
 msgid "grace period"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:126
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:154
 msgid "Outbound Endpoint"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:128
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:156
 msgid "Inbound Gateway"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:130
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:198
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:158
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:231
 msgid "Participant"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:136
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:164
 #, java-format
 msgid "Limited display to the {0} tunnels with the highest usage"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:138
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:166
 msgid "Inactive participating tunnels"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:141
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:266
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:169
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:299
 msgid "Lifetime bandwidth usage"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:143
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:171
 msgid "Not enough shared bandwidth to build participating tunnels."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:144
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:172
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:503
 msgid "Configure"
 msgstr ""
 
 #. renderPeers(out);
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:148
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:176
 msgid "Bandwidth Tiers"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:191
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:224
 msgid "Inbound or outbound?"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:192
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:225
 msgid "Expiry"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:195
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:228
 msgid "Participants"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:201
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:234
 msgid "Endpoint"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:225
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:258
 msgid "Locally hosted tunnel"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:227
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:232
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:260
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:265
 msgid "Bandwidth tier"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:252
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:260
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:285
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:293
 msgid "Build in progress"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:252
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:285
 msgid "inbound"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:260
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:293
 msgid "outbound"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:265
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:298
 msgid "No tunnels; waiting for the grace period to end."
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:267
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:300
 msgid "in"
 msgstr ""
 
-#: ../java/src/net/i2p/router/web/TunnelRenderer.java:268
+#: ../java/src/net/i2p/router/web/helpers/TunnelRenderer.java:301
 msgid "out"
 msgstr ""
 
@@ -5332,56 +5360,56 @@ msgid ""
 "internet connection."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:502
 msgid "KBps In"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:515
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:510
 msgid "KBps Out"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:530
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:516
 msgid "Share"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:537
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:546
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:523
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:551
 msgid "NOTE"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:539
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:525
 #, java-format
 msgid "You have configured I2P to share only {0} KBps."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:542
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:528
 msgid "I2P requires at least 12KBps to enable sharing. "
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:543
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:529
 msgid ""
 "Please enable sharing (participating in tunnels) by configuring more "
 "bandwidth. "
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:544
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:530
 msgid ""
 "It improves your anonymity by creating cover traffic, and helps the network."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:546
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:532
 #, java-format
 msgid "You have configured I2P to share {0} KBps."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:549
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:535
 msgid ""
 "The higher the share bandwidth the more you improve your anonymity and help "
 "the network."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:553
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:564
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:539
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:569
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:557
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:554
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:574
@@ -5392,7 +5420,7 @@ msgstr ""
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configplugins_jsp.java:548
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configplugins_jsp.java:569
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:649
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:728
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:626
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:560
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:509
@@ -5449,11 +5477,11 @@ msgstr ""
 msgid "Advanced I2P Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:548
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:553
 msgid "Some changes may require a restart to take effect."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:552
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:557
 #, java-format
 msgid "To make changes, edit the file: {0}"
 msgstr ""
@@ -5601,18 +5629,19 @@ msgid "Search Engines"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:564
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:476
 msgid "Applications and Configuration"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:580
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:480
 msgid "Hidden Services of Interest"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configi2cp_jsp.java:539
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:540
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:571
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:551
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:607
 msgid "The default settings will work for most people."
 msgstr ""
 
@@ -5690,11 +5719,7 @@ msgid "I2PTunnel page"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:551
-msgid "Dest. name, hash, or full key"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:553
-msgid "Encryption Key"
+msgid "Full destination, name, base 32, or hash"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:218
@@ -6066,136 +6091,234 @@ msgid ""
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
+msgid ""
+"If a firewall is blocking your connections to reseed hosts, you may have "
+"access to a proxy."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:537
+msgid ""
+"The proxy may be a remote public proxy, or may be running on your computer "
+"(localhost)."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
+msgid "To use a proxy, configure the type, hostname, and port below."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:541
+msgid ""
+"If you are running Tor Browser, reseed through it by configuring SOCKS 5, "
+"localhost, port 9150."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:543
+msgid ""
+"If you are running command-line Tor, reseed through it by configuring SOCKS "
+"5, localhost, port 9050."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:545
+msgid ""
+"If you have some peers but need more, you may try the I2P Outproxy option. "
+"Leave the host and port blank."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:547
+msgid "This will not work for an initial reseed when you have no peers at all."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:549
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:561
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:569
+#, java-format
+msgid "Then, click \"{0}\"."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:553
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:609
+msgid ""
+"Change these only if HTTPS is blocked by a restrictive firewall and reseed "
+"has failed."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:555
+msgid ""
+"If you know and trust somebody that runs I2P, ask them to send you a reseed "
+"file generated using this page on their router console."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:557
+msgid "Then, use this page to reseed with the file you received."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:559
+msgid "First, select the file below."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:563
+msgid ""
+"If you know and trust somebody that publishes reseed files, ask them for the "
+"URL."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:565
+msgid "Then, use this page to reseed with the URL you received."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:567
+msgid "First, enter the URL below."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:571
 #, java-format
 msgid "See {0} for instructions on reseeding manually."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:571
 msgid "the FAQ"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:537
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:573
 msgid "Manual Reseed"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:575
 msgid ""
 "The su3 format is preferred, as it will be verified as signed by a trusted "
 "source."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:541
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:577
 msgid ""
 "The zip format is unsigned; use a zip file only from a source that you trust."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:547
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:583
 msgid "Enter zip or su3 URL"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:551
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:587
 msgid "Reseed from File"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:555
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591
 msgid "Select zip or su3 file"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:559
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:595
 msgid "Create Reseed File"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:561
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:597
 msgid ""
 "Create a new reseed zip file you may share for others to reseed manually."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:563
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:599
 msgid "This file will never contain your own router's identity or IP."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:565
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:601
 msgid "Create reseed file"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:569
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:605
 msgid "Reseeding Configuration"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:573
-msgid ""
-"Change these only if HTTPS is blocked by a restrictive firewall and reseed "
-"has failed."
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:575
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:613
 msgid "Reseed URL Selection"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:581
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:619
 msgid "Try SSL first then non-SSL"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:587
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:625
 msgid "Use SSL only"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:593
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:631
 msgid "Use non-SSL only"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:595
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:635
 msgid "Reseed URLs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:601
-msgid "Enable HTTP Proxy?"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:643
+msgid "Proxy type for HTTPS reseed URLs"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:605
-msgid "HTTP Proxy Host"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:649
+msgid "None"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:609
-msgid "HTTP Proxy Port"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:655
+msgid "HTTPS"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:613
-msgid "Use HTTP Proxy Authorization?"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:661
+msgid "SOCKS 4/4a"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:617
-msgid "HTTP Proxy Username"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:667
+msgid "SOCKS 5"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:621
-msgid "HTTP Proxy Password"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:673
+msgid "I2P Outproxy"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:625
-msgid "Enable HTTPS Proxy?"
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:675
+msgid "Not for initial reseed. Leave host and port blank."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:629
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:677
 msgid "HTTPS Proxy Host"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:633
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:681
 msgid "HTTPS Proxy Port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:637
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:685
 msgid "Use HTTPS Proxy Authorization?"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:641
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:689
 msgid "HTTPS Proxy Username"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:645
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:693
 msgid "HTTPS Proxy Password"
 msgstr ""
 
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:702
+msgid "Enable proxy for HTTP reseed URLs?"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:706
+msgid "HTTP Proxy Host"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:710
+msgid "HTTP Proxy Port"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:714
+msgid "Use HTTP Proxy Authorization?"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:718
+msgid "HTTP Proxy Username"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:722
+msgid "HTTP Proxy Password"
+msgstr ""
+
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:220
 msgid "config service"
 msgstr ""
@@ -6311,7 +6434,7 @@ msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:618
 msgid ""
-"I2P's main configuration interface is this web console, so for your "
+"I2P's main configuration interface is this web.helpers, so for your "
 "convenience I2P can launch a web browser on startup pointing at"
 msgstr ""
 
@@ -6589,8 +6712,8 @@ msgstr ""
 msgid "home"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:450
 msgid "Welcome to I2P"
 msgstr ""
 
@@ -7351,7 +7474,7 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:458
 msgid "Search"
 msgstr ""
 
diff --git a/apps/susimail/locale/messages_en.po b/apps/susimail/locale/messages_en.po
index 0c07322740..c65b7dcd91 100644
--- a/apps/susimail/locale/messages_en.po
+++ b/apps/susimail/locale/messages_en.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P susimail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-05 23:01+0000\n"
+"POT-Creation-Date: 2018-01-18 09:06+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,338 +18,351 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/src/i2p/susi/webmail/MailPart.java:207
+#: src/src/i2p/susi/webmail/MailPart.java:216
 #, java-format
 msgid "No encoder found for encoding \\''{0}\\''."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:330
-#: src/src/i2p/susi/webmail/WebMail.java:344
-#: src/src/i2p/susi/webmail/WebMail.java:1018
+#: src/src/i2p/susi/webmail/WebMail.java:359
+#: src/src/i2p/susi/webmail/WebMail.java:373
+#: src/src/i2p/susi/webmail/WebMail.java:1091
 msgid "Re:"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:334
-#: src/src/i2p/susi/webmail/WebMail.java:348
-#: src/src/i2p/susi/webmail/WebMail.java:1056
+#: src/src/i2p/susi/webmail/WebMail.java:363
+#: src/src/i2p/susi/webmail/WebMail.java:377
+#: src/src/i2p/susi/webmail/WebMail.java:1129
 msgid "Fwd:"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:607
+#: src/src/i2p/susi/webmail/WebMail.java:653
 msgid "unknown"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:628
+#: src/src/i2p/susi/webmail/WebMail.java:674
 msgid "Warning: no charset found, fallback to US-ASCII."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:642
+#: src/src/i2p/susi/webmail/WebMail.java:688
 #, java-format
 msgid "Charset \\''{0}\\'' not supported."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:646
+#: src/src/i2p/susi/webmail/WebMail.java:692
 #, java-format
 msgid "Part ({0}) not shown, because of {1}"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:682
-#: src/src/i2p/susi/webmail/WebMail.java:685
+#: src/src/i2p/susi/webmail/WebMail.java:742
+#: src/src/i2p/susi/webmail/WebMail.java:747
 #, java-format
 msgid "Download attachment {0}"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:686
+#: src/src/i2p/susi/webmail/WebMail.java:748
 msgid "File is packed into a zipfile for security reasons."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:691
+#: src/src/i2p/susi/webmail/WebMail.java:753
 #, java-format
 msgid "Attachment ({0})."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:742
+#: src/src/i2p/susi/webmail/WebMail.java:813
 msgid "Need username for authentication."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:746
+#: src/src/i2p/susi/webmail/WebMail.java:817
 msgid "Need password for authentication."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:750
+#: src/src/i2p/susi/webmail/WebMail.java:821
 msgid "Need hostname for connect."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:755
+#: src/src/i2p/susi/webmail/WebMail.java:826
 msgid "Need port number for pop3 connect."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:762
+#: src/src/i2p/susi/webmail/WebMail.java:833
 msgid "POP3 port number is not in range 0..65535."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:768
+#: src/src/i2p/susi/webmail/WebMail.java:839
 msgid "POP3 port number is invalid."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:774
+#: src/src/i2p/susi/webmail/WebMail.java:845
 msgid "Need port number for smtp connect."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:781
+#: src/src/i2p/susi/webmail/WebMail.java:852
 msgid "SMTP port number is not in range 0..65535."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:787
+#: src/src/i2p/susi/webmail/WebMail.java:858
 msgid "SMTP port number is invalid."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:861
+#: src/src/i2p/susi/webmail/WebMail.java:937
+#: src/src/i2p/susi/webmail/WebMail.java:945
 msgid "User logged out."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:864
-#: src/src/i2p/susi/webmail/WebMail.java:1170
+#: src/src/i2p/susi/webmail/WebMail.java:944
+#: src/src/i2p/susi/webmail/WebMail.java:1245
 msgid "Internal error, lost connection."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1021
+#: src/src/i2p/susi/webmail/WebMail.java:1094
 #, java-format
 msgid "On {0} {1} wrote:"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1068
+#: src/src/i2p/susi/webmail/WebMail.java:1141
 msgid "begin forwarded mail"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1090
+#: src/src/i2p/susi/webmail/WebMail.java:1163
 msgid "end forwarded mail"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1097
-#: src/src/i2p/susi/webmail/WebMail.java:2440
+#: src/src/i2p/susi/webmail/WebMail.java:1170
+#: src/src/i2p/susi/webmail/WebMail.java:2785
 msgid "Could not fetch mail body."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1127
+#: src/src/i2p/susi/webmail/WebMail.java:1200
 msgid "Message id not valid."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1165
-msgid "Configuration reloaded"
-msgstr ""
-
-#: src/src/i2p/susi/webmail/WebMail.java:1232
+#: src/src/i2p/susi/webmail/WebMail.java:1256
 #, java-format
-msgid "No Encoding found for {0}"
+msgid "{0} new message"
+msgid_plural "{0} new messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1258
+msgid "No new messages"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1236
+#: src/src/i2p/susi/webmail/WebMail.java:1317
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:349
 #, java-format
-msgid "Could not encode data: {0}"
+msgid "No Encoding found for {0}"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1241
+#: src/src/i2p/susi/webmail/WebMail.java:1320
 #, java-format
 msgid "Error reading uploaded file: {0}"
 msgstr ""
 
-#. error if we get here
-#: src/src/i2p/susi/webmail/WebMail.java:1326
-#: src/src/i2p/susi/webmail/WebMail.java:1329
+#: src/src/i2p/susi/webmail/WebMail.java:1407
 msgid "Attachment not found."
 msgstr ""
 
 #. error if we get here
-#: src/src/i2p/susi/webmail/WebMail.java:1356
-#: src/src/i2p/susi/webmail/WebMail.java:1358
+#: src/src/i2p/susi/webmail/WebMail.java:1435
+#: src/src/i2p/susi/webmail/WebMail.java:1437
+#: src/src/i2p/susi/webmail/WebMail.java:1935
+#: src/src/i2p/susi/webmail/WebMail.java:2789
 msgid "Message not found."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1403
-#: src/src/i2p/susi/webmail/WebMail.java:1541
+#: src/src/i2p/susi/webmail/WebMail.java:1486
+#: src/src/i2p/susi/webmail/WebMail.java:1639
 msgid "Invalid pagesize number, resetting to default value."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1427
+#: src/src/i2p/susi/webmail/WebMail.java:1522
 msgid "No messages marked for deletion."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1443
+#: src/src/i2p/susi/webmail/WebMail.java:1539
 #, java-format
 msgid "1 message deleted."
 msgid_plural "{0} messages deleted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1505
+#: src/src/i2p/susi/webmail/WebMail.java:1603
 #, java-format
 msgid "Host unchanged. Edit configation file {0} to change host."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1520
+#: src/src/i2p/susi/webmail/WebMail.java:1618
 msgid "Configuration saved"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1757
-#: src/src/i2p/susi/webmail/WebMail.java:2229
+#: src/src/i2p/susi/webmail/WebMail.java:1921
+#: src/src/i2p/susi/webmail/WebMail.java:2513
 msgid "Login"
 msgstr ""
 
 #. mailbox.getNumMails() forces a connection, don't use it
 #. Not only does it slow things down, but a failure causes all our messages to "vanish"
 #. subtitle = ngettext("1 Message", "{0} Messages", sessionObject.mailbox.getNumMails());
-#: src/src/i2p/susi/webmail/WebMail.java:1762
+#: src/src/i2p/susi/webmail/WebMail.java:1926
 #, java-format
 msgid "1 Message"
 msgid_plural "{0} Messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1768
+#: src/src/i2p/susi/webmail/WebMail.java:1933
 msgid "Show Message"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1770
+#: src/src/i2p/susi/webmail/WebMail.java:1938
 msgid "New Message"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1772
+#: src/src/i2p/susi/webmail/WebMail.java:1940
 msgid "Configuration"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1783
+#: src/src/i2p/susi/webmail/WebMail.java:1951
 msgid "SusiMail"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1796
+#: src/src/i2p/susi/webmail/WebMail.java:1964
 msgid "Message has not been sent. Do you want to discard it?"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1870
+#: src/src/i2p/susi/webmail/WebMail.java:2083
 #, java-format
 msgid "Error decoding content: {0}"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1979
+#: src/src/i2p/susi/webmail/WebMail.java:2261
 msgid "no subject"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1996
+#: src/src/i2p/susi/webmail/WebMail.java:2278
 msgid "Found no valid sender address."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2002
+#: src/src/i2p/susi/webmail/WebMail.java:2284
 #, java-format
 msgid "Found no valid address in \\''{0}\\''."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2023
+#: src/src/i2p/susi/webmail/WebMail.java:2305
 msgid "No recipients found."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2087
+#: src/src/i2p/susi/webmail/WebMail.java:2331
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:297
+#, java-format
+msgid "Email is too large, max is {0}"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2373
 msgid "Mail sent."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2131
+#: src/src/i2p/susi/webmail/WebMail.java:2415
 msgid "Send"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2132
-#: src/src/i2p/susi/webmail/WebMail.java:2342
-#: src/src/i2p/susi/webmail/WebMail.java:2479
+#: src/src/i2p/susi/webmail/WebMail.java:2416
+#: src/src/i2p/susi/webmail/WebMail.java:2636
+#: src/src/i2p/susi/webmail/WebMail.java:2702
+#: src/src/i2p/susi/webmail/WebMail.java:2838
 msgid "Cancel"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2175
-#: src/src/i2p/susi/webmail/WebMail.java:2269
-#: src/src/i2p/susi/webmail/WebMail.java:2427
+#: src/src/i2p/susi/webmail/WebMail.java:2459
+#: src/src/i2p/susi/webmail/WebMail.java:2562
+#: src/src/i2p/susi/webmail/WebMail.java:2764
 msgid "From"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2176
+#: src/src/i2p/susi/webmail/WebMail.java:2460
+#: src/src/i2p/susi/webmail/WebMail.java:2769
 msgid "To"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2177
+#: src/src/i2p/susi/webmail/WebMail.java:2461
+#: src/src/i2p/susi/webmail/WebMail.java:2773
 msgid "Cc"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2178
+#: src/src/i2p/susi/webmail/WebMail.java:2462
 msgid "Bcc"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2179
+#: src/src/i2p/susi/webmail/WebMail.java:2463
 msgid "Bcc to self"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2180
-#: src/src/i2p/susi/webmail/WebMail.java:2270
-#: src/src/i2p/susi/webmail/WebMail.java:2429
+#: src/src/i2p/susi/webmail/WebMail.java:2464
+#: src/src/i2p/susi/webmail/WebMail.java:2563
+#: src/src/i2p/susi/webmail/WebMail.java:2766
 msgid "Subject"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2183
+#: src/src/i2p/susi/webmail/WebMail.java:2467
 msgid "Add Attachment"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2183
+#: src/src/i2p/susi/webmail/WebMail.java:2467
 msgid "Add another attachment"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2189
+#: src/src/i2p/susi/webmail/WebMail.java:2473
 msgid "Attachments"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2198
+#: src/src/i2p/susi/webmail/WebMail.java:2482
 msgid "Delete selected attachments"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2215
+#: src/src/i2p/susi/webmail/WebMail.java:2499
 msgid "I2PMail Login"
 msgstr ""
 
 #. current postman hq length limits 16/12, new postman version 32/32
-#: src/src/i2p/susi/webmail/WebMail.java:2217
+#: src/src/i2p/susi/webmail/WebMail.java:2501
 msgid "User"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2218
+#: src/src/i2p/susi/webmail/WebMail.java:2502
 msgid "Password"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2223
+#: src/src/i2p/susi/webmail/WebMail.java:2507
 msgid "Host"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2224
+#: src/src/i2p/susi/webmail/WebMail.java:2508
 msgid "POP3 Port"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2225
+#: src/src/i2p/susi/webmail/WebMail.java:2509
 msgid "SMTP Port"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2230
+#: src/src/i2p/susi/webmail/WebMail.java:2514
 msgid "Read Mail Offline"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2234
-#: src/src/i2p/susi/webmail/WebMail.java:2361
+#: src/src/i2p/susi/webmail/WebMail.java:2518
+#: src/src/i2p/susi/webmail/WebMail.java:2655
 msgid "Settings"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2236
+#: src/src/i2p/susi/webmail/WebMail.java:2520
 msgid "Create Account"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2236
+#: src/src/i2p/susi/webmail/WebMail.java:2520
 msgid "Learn about I2P mail"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2249
-#: src/src/i2p/susi/webmail/WebMail.java:2406
+#: src/src/i2p/susi/webmail/WebMail.java:2533
+#: src/src/i2p/susi/webmail/WebMail.java:2714
 msgid "New"
 msgstr ""
 
@@ -359,184 +372,178 @@ msgstr ""
 #. button( REPLYALL, _t("Reply All") ) +
 #. button( FORWARD, _t("Forward") ) + spacer +
 #. button( DELETE, _t("Delete") ) + spacer +
-#: src/src/i2p/susi/webmail/WebMail.java:2256
+#: src/src/i2p/susi/webmail/WebMail.java:2540
 msgid "Check Mail"
 msgstr ""
 
 #. if (Config.hasConfigFile())
 #. out.println(button( RELOAD, _t("Reload Config") ) + spacer);
-#: src/src/i2p/susi/webmail/WebMail.java:2259
-#: src/src/i2p/susi/webmail/WebMail.java:2415
-#: src/src/i2p/susi/webmail/WebMail.java:2481
+#: src/src/i2p/susi/webmail/WebMail.java:2543
+#: src/src/i2p/susi/webmail/WebMail.java:2726
+#: src/src/i2p/susi/webmail/WebMail.java:2840
 msgid "Logout"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2268
+#: src/src/i2p/susi/webmail/WebMail.java:2561
 msgid "Mark for deletion"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2271
-#: src/src/i2p/susi/webmail/WebMail.java:2431
+#: src/src/i2p/susi/webmail/WebMail.java:2564
+#: src/src/i2p/susi/webmail/WebMail.java:2776
 msgid "Date"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2274
+#: src/src/i2p/susi/webmail/WebMail.java:2567
 msgid "Size"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2315
+#: src/src/i2p/susi/webmail/WebMail.java:2609
 msgid "Message is new"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2318
+#: src/src/i2p/susi/webmail/WebMail.java:2612
 msgid "Message has an attachment"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2320
+#: src/src/i2p/susi/webmail/WebMail.java:2614
 msgid "Message is spam"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2328
+#: src/src/i2p/susi/webmail/WebMail.java:2622
 msgid "No messages"
 msgstr ""
 
 #. TODO ngettext
-#: src/src/i2p/susi/webmail/WebMail.java:2340
+#: src/src/i2p/susi/webmail/WebMail.java:2634
 msgid "Really delete the marked messages?"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2341
+#: src/src/i2p/susi/webmail/WebMail.java:2635
 msgid "Yes, really delete them!"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2344
+#: src/src/i2p/susi/webmail/WebMail.java:2638
 msgid "Delete Selected"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2346
+#: src/src/i2p/susi/webmail/WebMail.java:2640
 msgid "Mark All"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2348
+#: src/src/i2p/susi/webmail/WebMail.java:2642
 msgid "Clear All"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2373
-#: src/src/i2p/susi/webmail/WebMail.java:2374
+#: src/src/i2p/susi/webmail/WebMail.java:2667
 msgid "First"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2373
-#: src/src/i2p/susi/webmail/WebMail.java:2374
-#: src/src/i2p/susi/webmail/WebMail.java:2417
+#: src/src/i2p/susi/webmail/WebMail.java:2668
+#: src/src/i2p/susi/webmail/WebMail.java:2732
 msgid "Previous"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2376
+#: src/src/i2p/susi/webmail/WebMail.java:2677
 #, java-format
 msgid "Page {0} of {1}"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2379
-#: src/src/i2p/susi/webmail/WebMail.java:2380
-msgid "Last"
+#: src/src/i2p/susi/webmail/WebMail.java:2679
+#: src/src/i2p/susi/webmail/WebMail.java:2747
+msgid "Next"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2379
-#: src/src/i2p/susi/webmail/WebMail.java:2380
-#: src/src/i2p/susi/webmail/WebMail.java:2419
-msgid "Next"
+#: src/src/i2p/susi/webmail/WebMail.java:2680
+msgid "Last"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2394
+#: src/src/i2p/susi/webmail/WebMail.java:2700
 msgid "Really delete this message?"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2394
+#: src/src/i2p/susi/webmail/WebMail.java:2701
 msgid "Yes, really delete it!"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2407
+#: src/src/i2p/susi/webmail/WebMail.java:2717
 msgid "Reply"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2408
+#: src/src/i2p/susi/webmail/WebMail.java:2718
 msgid "Reply All"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2409
+#: src/src/i2p/susi/webmail/WebMail.java:2719
 msgid "Forward"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2410
+#: src/src/i2p/susi/webmail/WebMail.java:2720
 msgid "Save As"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2412
-#: src/src/i2p/susi/webmail/WebMail.java:2414
+#: src/src/i2p/susi/webmail/WebMail.java:2722
+#: src/src/i2p/susi/webmail/WebMail.java:2724
 msgid "Delete"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2418
+#: src/src/i2p/susi/webmail/WebMail.java:2744
 msgid "Back to Folder"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2444
-msgid "Could not fetch mail."
-msgstr ""
-
-#: src/src/i2p/susi/webmail/WebMail.java:2462
+#: src/src/i2p/susi/webmail/WebMail.java:2821
 msgid "Folder Page Size"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2465
+#: src/src/i2p/susi/webmail/WebMail.java:2824
 msgid "Set"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2468
+#: src/src/i2p/susi/webmail/WebMail.java:2827
 msgid "Advanced Configuration"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:2478
+#: src/src/i2p/susi/webmail/WebMail.java:2837
 msgid "Save Configuration"
 msgstr ""
 
 #. this appears in the UI so translate
 #: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:102
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:751
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:793
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:748
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:790
 msgid "No response from server"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:668
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:616
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:239
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:253
+msgid "Cannot connect"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:665
 msgid "Error connecting to server"
 msgstr ""
 
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:670
 #: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:673
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:676
 msgid "Error opening mailbox"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1025
-#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:249
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1022
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:309
 msgid "Login failed"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:214
-msgid "Cannot connect"
-msgstr ""
-
-#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:225
-#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:237
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:251
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:280
 msgid "Server refused connection"
 msgstr ""
 
 #. TODO which recipient?
-#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:262
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:322
 msgid "Mail rejected"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:276
-#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:279
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:422
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:425
 msgid "Error sending mail"
 msgstr ""
-- 
GitLab